diff options
| author | Hugh Dickins <hugh@veritas.com> | 2008-03-04 14:33:24 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 14:55:34 -0500 |
| commit | fcab59a3186640ce085e89ee6dfc03cacfb6c7c9 (patch) | |
| tree | 3b68cfba7e3b116809bfb173d7d61fa1452264a5 | |
| parent | 6275487806fbc17e92595b5880d7b0ee49363c4f (diff) | |
x86: a P4 is a P6 not an i486
P4 has been coming out as CPU_FAMILY=4 instead of 6: fix MPENTIUM4 typo.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/x86/Kconfig.cpu | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu index 6d50064db182..9304bfba7d45 100644 --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu | |||
| @@ -388,7 +388,7 @@ config X86_OOSTORE | |||
| 388 | # | 388 | # |
| 389 | config X86_P6_NOP | 389 | config X86_P6_NOP |
| 390 | def_bool y | 390 | def_bool y |
| 391 | depends on (X86_64 || !X86_GENERIC) && (M686 || MPENTIUMII || MPENTIUMIII || MPENTIUMM || MCORE2 || PENTIUM4) | 391 | depends on (X86_64 || !X86_GENERIC) && (M686 || MPENTIUMII || MPENTIUMIII || MPENTIUMM || MCORE2 || MPENTIUM4) |
| 392 | 392 | ||
| 393 | config X86_TSC | 393 | config X86_TSC |
| 394 | def_bool y | 394 | def_bool y |