patch-2.3.99-pre4 linux/arch/i386/config.in

• Lines: 53
• Date: Tue Apr 4 22:42:30 2000
• Orig file: v2.3.99-pre3/linux/arch/i386/config.in
• Orig date: Mon Mar 27 08:08:21 2000

diff -u --recursive --new-file v2.3.99-pre3/linux/arch/i386/config.in linux/arch/i386/config.in
@@ -6,6 +6,7 @@
 
 define_bool CONFIG_X86 y
 define_bool CONFIG_ISA y
+define_bool CONFIG_SBUS n
 
 define_bool CONFIG_UID16 y
 
@@ -43,11 +44,17 @@
    define_bool CONFIG_X86_USE_STRING_486 y
    define_bool CONFIG_X86_ALIGNMENT_16 y
 fi
-if [ "$CONFIG_M586TSC" = "y" -o "$CONFIG_MK6" = "y" ]; then
+if [ "$CONFIG_M586TSC" = "y" ]; then
    define_bool CONFIG_X86_USE_STRING_486 y
    define_bool CONFIG_X86_ALIGNMENT_16 y
    define_bool CONFIG_X86_TSC y
 fi
+if [ "$CONFIG_MK6" = "y" ]; then
+   define_bool CONFIG_X86_ALIGNMENT_16 y
+   define_bool CONFIG_X86_TSC y
+   define_bool CONFIG_X86_USE_3DNOW y
+   define_bool CONFIG_X86_USE_PPRO_CHECKSUM y
+fi
 if [ "$CONFIG_M686" = "y" ]; then
    define_bool CONFIG_X86_TSC y
    define_bool CONFIG_X86_GOOD_APIC y
@@ -136,6 +143,8 @@
 
 if [ "$CONFIG_HOTPLUG" = "y" ] ; then
    source drivers/pcmcia/Config.in
+else
+   define_bool CONFIG_PCMCIA n
 fi
 
 bool 'System V IPC' CONFIG_SYSVIPC
@@ -252,7 +261,6 @@
 
 source drivers/char/Config.in
 
-source drivers/usb/Config.in
 
 #source drivers/misc/Config.in
 
@@ -278,6 +286,8 @@
    source drivers/sound/Config.in
 fi
 endmenu
+
+source drivers/usb/Config.in
 
 mainmenu_option next_comment
 comment 'Kernel hacking'