patch-2.2.19 linux/arch/i386/config.in
Next file: linux/arch/i386/defconfig
Previous file: linux/arch/i386/boot/setup.S
Back to the patch index
Back to the overall index
- Lines: 26
- Date:
Sun Mar 25 11:37:29 2001
- Orig file:
v2.2.18/arch/i386/config.in
- Orig date:
Sun Mar 25 11:28:16 2001
diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.18/arch/i386/config.in linux/arch/i386/config.in
@@ -12,11 +12,11 @@
mainmenu_option next_comment
comment 'Processor type and features'
choice 'Processor family' \
- "386 CONFIG_M386 \
- 486/Cx486 CONFIG_M486 \
- 586/K5/5x86/6x86 CONFIG_M586 \
- Pentium/K6/TSC CONFIG_M586TSC \
- PPro/6x86MX CONFIG_M686" PPro
+ "386 CONFIG_M386 \
+ 486/Cx486 CONFIG_M486 \
+ 586/K5/5x86/6x86 CONFIG_M586 \
+ Pentium/K6/TSC/CyrixIII CONFIG_M586TSC \
+ PPro/6x86MX CONFIG_M686" PPro
#
# Define implied options from the CPU selection here
#
@@ -33,7 +33,7 @@
define_bool CONFIG_X86_GOOD_APIC y
fi
-tristate '/dev/cpu/microcode - Intel P6 CPU microcode support' CONFIG_MICROCODE
+tristate '/dev/cpu/microcode - Intel IA32 CPU microcode support' CONFIG_MICROCODE
tristate '/dev/cpu/*/msr - Model-specific register support' CONFIG_X86_MSR
tristate '/dev/cpu/*/cpuid - CPU information support' CONFIG_X86_CPUID
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)