---

yaml --- r: 86770 b: refs/heads/master c: fcab59a h: refs/heads/master v: v3
git-mirror · Mar 4, 2008 · c6d5caa · c6d5caa
1 parent e4a2365
commit c6d5caa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6275487806fbc17e92595b5880d7b0ee49363c4f
+refs/heads/master: fcab59a3186640ce085e89ee6dfc03cacfb6c7c9
diff --git a/trunk/arch/x86/Kconfig.cpu b/trunk/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