patch-2.4.0-test3 linux/arch/i386/config.in

• Lines: 63
• Date: Fri Jul 7 17:55:02 2000
• Orig file: v2.4.0-test2/linux/arch/i386/config.in
• Orig date: Fri Jun 23 21:55:07 2000

diff -u --recursive --new-file v2.4.0-test2/linux/arch/i386/config.in linux/arch/i386/config.in
@@ -21,7 +21,7 @@
 	"386				CONFIG_M386 \
 	 486				CONFIG_M486 \
 	 586/K5/5x86/6x86/6x86MX	CONFIG_M586 \
-	 Pentium/Pentium-MMX		CONFIG_M586TSC \
+	 Pentium-Classic/Pentium-MMX	CONFIG_M586TSC \
 	 Pentium-Pro/Celeron/Pentium-II	CONFIG_M686 \
 	 Pentium-III			CONFIG_M686FXSR \
 	 K6/K6-II/K6-III		CONFIG_MK6 \
@@ -29,11 +29,12 @@
 	 Crusoe				CONFIG_MCRUSOE \
 	 Winchip-C6			CONFIG_MWINCHIPC6 \
 	 Winchip-2			CONFIG_MWINCHIP2 \
-	 Winchip-2A/3			CONFIG_MWINCHIP3D" Pentium-Pro
+	 Winchip-2A/Winchip-3		CONFIG_MWINCHIP3D" Pentium-Pro
 #
 # Define implied options from the CPU selection here
 #
 if [ "$CONFIG_M386" = "y" ]; then
+   define_bool CONFIG_X86_CMPXCHG n
    define_int  CONFIG_X86_L1_CACHE_BYTES 16
 else
    define_bool CONFIG_X86_WP_WORKS_OK y
@@ -73,8 +74,6 @@
    define_bool CONFIG_X86_USE_PPRO_CHECKSUM y
    define_bool CONFIG_X86_FXSR y
    define_bool CONFIG_X86_XMM y
-else
-   define_bool CONFIG_X86_FXSR n
 fi
 if [ "$CONFIG_MK6" = "y" ]; then
    define_int  CONFIG_X86_L1_CACHE_BYTES 32
@@ -141,6 +140,9 @@
        define_bool CONFIG_X86_LOCAL_APIC y
     fi
 fi
+if [ "$CONFIG_SMP" = "y" -a "$CONFIG_X86_CMPXCHG" = "y" ]; then
+    define_bool CONFIG_HAVE_DEC_LOCK y
+fi
 endmenu
 
 mainmenu_option next_comment
@@ -209,9 +211,10 @@
 
 bool 'Power Management support' CONFIG_PM
 
-dep_tristate '  ACPI support' CONFIG_ACPI $CONFIG_PM
+dep_bool '  ACPI support' CONFIG_ACPI $CONFIG_PM
 if [ "$CONFIG_ACPI" != "n" ]; then
    if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+      bool '    ACPI interpreter (EXPERIMENTAL)' CONFIG_ACPI_INTERPRETER
       bool '    Enter S1 for sleep (EXPERIMENTAL)' CONFIG_ACPI_S1_SLEEP
    fi
 fi
@@ -229,6 +232,8 @@
 fi
 
 endmenu
+
+source drivers/mtd/Config.in
 
 source drivers/parport/Config.in