patch-2.2.0-pre1 linux/arch/i386/config.in

• Lines: 32
• Date: Sun Dec 27 10:48:46 1998
• Orig file: v2.1.132/linux/arch/i386/config.in
• Orig date: Tue Dec 22 14:16:53 1998

diff -u --recursive --new-file v2.1.132/linux/arch/i386/config.in linux/arch/i386/config.in
@@ -17,9 +17,7 @@
 	 Pentium/K5/5x86/6x86	CONFIG_M586	\
 	 PPro/K6/6x86MX		CONFIG_M686" Pentium
 bool 'Math emulation' CONFIG_MATH_EMULATION
-if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-  bool 'MTRR (Memory Type Range Register) support' CONFIG_MTRR
-fi
+bool 'MTRR (Memory Type Range Register) support' CONFIG_MTRR
 bool 'Symmetric multi-processing support' CONFIG_SMP
 endmenu
 
@@ -38,10 +36,16 @@
 bool 'Networking support' CONFIG_NET
 bool 'PCI support' CONFIG_PCI
 if [ "$CONFIG_PCI" = "y" ]; then
-  bool '   PCI BIOS support' CONFIG_PCI_BIOS
-  bool '   PCI direct access support' CONFIG_PCI_DIRECT
-  if [ "$CONFIG_PCI_BIOS" = "n" -a "$CONFIG_PCI_DIRECT" = "n" ]; then
-    define_bool CONFIG_PCI_BIOS "y"
+  unset CONFIG_PCI_BIOS CONFIG_PCI_DIRECT
+  choice 'PCI access mode' \
+	"BIOS		CONFIG_PCI_GOBIOS	\
+	 Direct		CONFIG_PCI_GODIRECT	\
+	 Any		CONFIG_PCI_GOANY"	Any
+  if [ -n "$CONFIG_PCI_GOBIOS" -o -n "$CONFIG_PCI_GOANY" ]; then
+    define_bool CONFIG_PCI_BIOS y
+  fi
+  if [ -n "$CONFIG_PCI_GODIRECT" -o -n "$CONFIG_PCI_GOANY" ]; then
+    define_bool CONFIG_PCI_DIRECT y
   fi
   bool '   PCI quirks' CONFIG_PCI_QUIRKS
   if [ "$CONFIG_PCI_QUIRKS" = "y" -a "$CONFIG_EXPERIMENTAL" = "y" ]; then