From c6d5caa2e1801f191f4b1f7d61fec275bbdc205b Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hugh@veritas.com>
Date: Tue, 4 Mar 2008 19:33:24 +0000
Subject: [PATCH] --- yaml --- r: 86770 b: refs/heads/master c:
 fcab59a3186640ce085e89ee6dfc03cacfb6c7c9 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/arch/x86/Kconfig.cpu | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e70c85630925..a8f4afbd6c0d 100644
--- 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
index 6d50064db182..9304bfba7d45 100644
--- 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