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

• Lines: 69
• Date: Fri Dec 29 14:35:47 2000
• Orig file: v2.4.0-test12/linux/arch/i386/config.in
• Orig date: Mon Dec 11 17:59:43 2000

diff -u --recursive --new-file v2.4.0-test12/linux/arch/i386/config.in linux/arch/i386/config.in
@@ -44,6 +44,9 @@
 #
 # Define implied options from the CPU selection here
 #
+
+unset CONFIG_X86_FXSR
+
 if [ "$CONFIG_M386" = "y" ]; then
    define_bool CONFIG_X86_CMPXCHG n
    define_int  CONFIG_X86_L1_CACHE_SHIFT 4
@@ -136,7 +139,6 @@
    define_bool CONFIG_X86_ALIGNMENT_16 y
    define_bool CONFIG_X86_TSC y
    define_bool CONFIG_X86_USE_PPRO_CHECKSUM y
-   define_bool CONFIG_X86_USE_3DNOW y
 fi
 tristate 'Toshiba Laptop support' CONFIG_TOSHIBA
 
@@ -162,15 +164,15 @@
 bool 'MTRR (Memory Type Range Register) support' CONFIG_MTRR
 bool 'Symmetric multi-processing support' CONFIG_SMP
 if [ "$CONFIG_SMP" != "y" ]; then
-    bool 'APIC and IO-APIC support on uniprocessors' CONFIG_X86_UP_IOAPIC
-    if [ "$CONFIG_X86_UP_IOAPIC" = "y" ]; then
-       define_bool CONFIG_X86_IO_APIC y
-       define_bool CONFIG_X86_LOCAL_APIC y
-    fi
+   bool 'APIC and IO-APIC support on uniprocessors' CONFIG_X86_UP_IOAPIC
+   if [ "$CONFIG_X86_UP_IOAPIC" = "y" ]; then
+      define_bool CONFIG_X86_IO_APIC y
+      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
+   define_bool CONFIG_HAVE_DEC_LOCK y
 fi
 endmenu
 
@@ -235,12 +237,8 @@
 
 bool 'Power Management support' 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
+if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+   dep_bool '  ACPI support' CONFIG_ACPI $CONFIG_PM
 fi
 
 dep_tristate '  Advanced Power Management BIOS support' CONFIG_APM $CONFIG_PM
@@ -278,10 +276,10 @@
 tristate 'ATA/IDE/MFM/RLL support' CONFIG_IDE
 
 if [ "$CONFIG_IDE" != "n" ]; then
-  source drivers/ide/Config.in
+   source drivers/ide/Config.in
 else
-  define_bool CONFIG_BLK_DEV_IDE_MODES n
-  define_bool CONFIG_BLK_DEV_HD n
+   define_bool CONFIG_BLK_DEV_IDE_MODES n
+   define_bool CONFIG_BLK_DEV_HD n
 fi
 endmenu