The patch below fixes the "PENTIUM" ambiguous ... error during
`make config'. Pentium has been renamed to Pentium-Classic. The patch is
for test2-pre12, but it should also work with previous versions:
diff -u --recursive --new-file linux-2.4.0-test2-pre12/Documentation/Configure.help linux/Documentation/Configure.help
--- linux-2.4.0-test2-pre12/Documentation/Configure.help Sat Jun 24 06:56:03 2000
+++ linux/Documentation/Configure.help Sat Jun 24 07:21:39 2000
@@ -2745,7 +2745,7 @@
SL/SLC/SLC2/SLC3/SX/SX2 and UMC U5D or U5S.
- "586" for generic Pentium CPUs, possibly lacking the TSC
(time stamp counter) register.
- - "Pentium" for the Intel Pentium/Pentium MMX.
+ - "Pentium-Classic" for the Intel Pentium/Pentium MMX.
- "Pentium-Pro" for the Intel Pentium Pro/Celeron/Pentium II.
- "Pentium-III" for the Intel Pentium III.
- "K6" for the AMD K6, K6-II and K6-III (aka K6-3D).
@@ -2753,7 +2753,7 @@
- "Crusoe" for the Transmeta Crusoe series.
- "Winchip-C6" for original IDT Winchip.
- "Winchip-2" for IDT Winchip 2.
- - "Winchip-2A/3" for IDT Winchips with 3dNow! capabilities.
+ - "Winchip-2A" for IDT Winchips with 3dNow! capabilities.
If you don't know what to do, choose "386".
diff -u --recursive --new-file linux-2.4.0-test2-pre12/arch/i386/config.in linux/arch/i386/config.in
--- linux-2.4.0-test2-pre12/arch/i386/config.in Sat Jun 24 06:56:10 2000
+++ linux/arch/i386/config.in Sat Jun 24 07:21:39 2000
@@ -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,7 +29,7 @@
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
#
-- Niels Kristian Bech Jensen -- nkbj@image.dk -- http://www.image.dk/~nkbj/----------->> Stop software piracy --- use free software! <<-----------
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Mon Jun 26 2000 - 21:00:03 EST