projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6275487)
x86: a P4 is a P6 not an i486
authorHugh Dickins <hugh@veritas.com>
Tue, 4 Mar 2008 19:33:24 +0000 (19:33 +0000)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 4 Mar 2008 19:55:34 +0000 (11:55 -0800)
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>
arch/x86/Kconfig.cpu patch | blob | blame | history

diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index 6d50064db182303dd27402b2e6c1c84d4502971b..9304bfba7d450fae5dc61ffa627a49fe1fdfeae6 100644 (file)
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -388,7 +388,7 @@ config X86_OOSTORE
 #
 config X86_P6_NOP
        def_bool y
-       depends on (X86_64 || !X86_GENERIC) && (M686 || MPENTIUMII || MPENTIUMIII || MPENTIUMM || MCORE2 || PENTIUM4)
+       depends on (X86_64 || !X86_GENERIC) && (M686 || MPENTIUMII || MPENTIUMIII || MPENTIUMM || MCORE2 || MPENTIUM4)
 
 config X86_TSC
        def_bool y