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

Next file: linux/arch/i386/defconfig
Previous file: linux/arch/i386/Makefile
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.40/linux/arch/i386/config.in linux/arch/i386/config.in
@@ -20,8 +20,9 @@
 	"386			CONFIG_M386	\
 	 486/Cx486		CONFIG_M486	\
 	 586/K5/5x86/6x86	CONFIG_M586	\
-	 Pentium/K6/TSC		CONFIG_M586TSC	\
+	 Pentium/TSC		CONFIG_M586TSC	\
 	 PPro/6x86MX		CONFIG_M686 \
+	 K6/II/II		CONFIG_MK6 \
 	 Athlon                 CONFIG_MK7" PPro
 #
 # Define implied options from the CPU selection here
@@ -38,6 +39,9 @@
 if [ "$CONFIG_M686" = "y" ]; then
    define_bool CONFIG_X86_GOOD_APIC y
    define_bool CONFIG_X86_PGE y
+fi
+if [ "$CONFIG_MK6" = "y" ]; then
+   define_bool CONFIG_X86_TSC y
 fi
 if [ "$CONFIG_MK7" = "y" ]; then
    define_bool CONFIG_X86_TSC y

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)