patch-2.1.75 linux/arch/i386/config.in

Next file: linux/arch/i386/defconfig
Previous file: linux/arch/i386/boot/compressed/misc.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.74/linux/arch/i386/config.in linux/arch/i386/config.in
@@ -10,6 +10,16 @@
 endmenu
 
 mainmenu_option next_comment
+comment 'Processor type and features'
+choice 'Processor family' \
+	"386			CONFIG_M386	\
+	 486/Cx486		CONFIG_M486	\
+	 Pentium/K5/5x86/6x86	CONFIG_M586	\
+	 PPro/K6/6x86MX		CONFIG_M686" Pentium
+bool 'Math emulation' CONFIG_MATH_EMULATION
+endmenu
+
+mainmenu_option next_comment
 comment 'Loadable module support'
 bool 'Enable loadable module support' CONFIG_MODULES
 if [ "$CONFIG_MODULES" = "y" ]; then
@@ -21,7 +31,6 @@
 mainmenu_option next_comment
 comment 'General setup'
 
-bool 'Kernel math emulation' CONFIG_MATH_EMULATION
 bool 'Networking support' CONFIG_NET
 bool 'PCI support' CONFIG_PCI
 if [ "$CONFIG_PCI" = "y" ]; then
@@ -41,16 +50,11 @@
   tristate 'Kernel support for JAVA binaries (obsolete)' CONFIG_BINFMT_JAVA
 fi
 
-choice 'Processor type' \
-	"386		CONFIG_M386	\
-	 486		CONFIG_M486	\
-	 Pentium	CONFIG_M586	\
-	 PPro		CONFIG_M686" Pentium
 bool 'Video mode selection support' CONFIG_VIDEO_SELECT
 
 tristate 'Parallel port support' CONFIG_PARPORT
 if [ "$CONFIG_PARPORT" != "n" ]; then
-  dep_tristate '  PC-style hardware' CONFIG_PARPORT_PC $CONFIG_PARPORT
+  dep_tristate '   PC-style hardware' CONFIG_PARPORT_PC $CONFIG_PARPORT
 fi
 
 endmenu
@@ -140,3 +144,5 @@
 fi
 bool 'Magic SysRq key' CONFIG_MAGIC_SYSRQ
 endmenu
+
+define_bool CONFIG_VGA_CONSOLE y

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov