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

• Lines: 45
• Date: Thu Nov 16 12:51:28 2000
• Orig file: v2.4.0-test10/linux/arch/i386/config.in
• Orig date: Tue Oct 31 12:42:26 2000

diff -u --recursive --new-file v2.4.0-test10/linux/arch/i386/config.in linux/arch/i386/config.in
@@ -34,6 +34,7 @@
 	 Pentium-MMX			CONFIG_M586MMX \
 	 Pentium-Pro/Celeron/Pentium-II	CONFIG_M686 \
 	 Pentium-III			CONFIG_M686FXSR \
+	 Pentium-4			CONFIG_MPENTIUM4 \
 	 K6/K6-II/K6-III		CONFIG_MK6 \
 	 Athlon/K7			CONFIG_MK7 \
 	 Crusoe				CONFIG_MCRUSOE \
@@ -92,6 +93,15 @@
    define_bool CONFIG_X86_FXSR y
    define_bool CONFIG_X86_XMM y
 fi
+if [ "$CONFIG_MPENTIUM4" = "y" ]; then
+   define_int  CONFIG_X86_L1_CACHE_SHIFT 7
+   define_bool CONFIG_X86_TSC y
+   define_bool CONFIG_X86_GOOD_APIC y
+   define_bool CONFIG_X86_PGE y
+   define_bool CONFIG_X86_USE_PPRO_CHECKSUM y
+   define_bool CONFIG_X86_FXSR y
+   define_bool CONFIG_X86_XMM y
+fi
 if [ "$CONFIG_MK6" = "y" ]; then
    define_int  CONFIG_X86_L1_CACHE_SHIFT 5
    define_bool CONFIG_X86_ALIGNMENT_16 y
@@ -158,6 +168,7 @@
        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
@@ -194,8 +205,12 @@
 
 source drivers/pci/Config.in
 
+bool 'EISA support' CONFIG_EISA
+
 if [ "$CONFIG_VISWS" != "y" ]; then
    bool 'MCA support' CONFIG_MCA
+else
+   define_bool CONFIG_MCA n
 fi
 
 bool 'Support for hot-pluggable devices' CONFIG_HOTPLUG