From b5268d6ae07509846a6c95fc5ad825dab185ea8d Mon Sep 17 00:00:00 2001
From: Catalin Marinas <catalin.marinas@arm.com>
Date: Wed, 1 Sep 2010 14:33:29 +0100
Subject: [PATCH] --- yaml --- r: 210430 b: refs/heads/master c:
 026b5ca3b65f878019a8eb0c7a702cd5c20a4104 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/arch/arm/mm/Kconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d0fb9691067d..b3b783722dda 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6d17c1a8e64e8b7f58dde3d353de664a492908a
+refs/heads/master: 026b5ca3b65f878019a8eb0c7a702cd5c20a4104
diff --git a/trunk/arch/arm/mm/Kconfig b/trunk/arch/arm/mm/Kconfig
index 33c3f570aaa0..a0a2928ae4dd 100644
--- a/trunk/arch/arm/mm/Kconfig
+++ b/trunk/arch/arm/mm/Kconfig
@@ -398,7 +398,7 @@ config CPU_V6
 # ARMv6k
 config CPU_32v6K
 	bool "Support ARM V6K processor extensions" if !SMP
-	depends on CPU_V6
+	depends on CPU_V6 || CPU_V7
 	default y if SMP && !(ARCH_MX3 || ARCH_OMAP2)
 	help
 	  Say Y here if your ARMv6 processor supports the 'K' extension.