diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 02:59:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 02:59:00 +0000 |
| commit | 1fcb7623bc138d780101d7a70cfe29b11f7c67ef (patch) | |
| tree | e1ec9bb6aa19db16a405fb4393e2a90c38b4c75d /Documentation/Configure.help | |
| parent | 458fe58677afb17219d864e100131728038b4f1b (diff) | |
Merge with Linux 2.4.0-test3-pre5. 64-bit kernel are still not
-Werror clean.
Diffstat (limited to 'Documentation/Configure.help')
| -rw-r--r-- | Documentation/Configure.help | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/Configure.help b/Documentation/Configure.help index 62f8788f9..c7ee9aa5f 100644 --- a/Documentation/Configure.help +++ b/Documentation/Configure.help @@ -2769,7 +2769,7 @@ CONFIG_M386 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). @@ -2777,7 +2777,7 @@ CONFIG_M386 - "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". |