From 25e2ea38e964dd4eabef4617e2ee153a2f693e0d Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 10 Feb 2011 13:05:13 +0000
Subject: [PATCH] --- yaml --- r: 233216 b: refs/heads/master c:
 0193c00e85a35ceee7856c89c25b34d5752e0baa 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 737a14858c00..6d1b8beb4108 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15490ef8ff8fd22d677cb5d4f6a98e5a79118dba
+refs/heads/master: 0193c00e85a35ceee7856c89c25b34d5752e0baa
diff --git a/trunk/arch/arm/mm/Kconfig b/trunk/arch/arm/mm/Kconfig
index c9d2d56feced..e4509bae8fc4 100644
--- a/trunk/arch/arm/mm/Kconfig
+++ b/trunk/arch/arm/mm/Kconfig
@@ -644,7 +644,7 @@ config ARM_THUMBEE
 
 config SWP_EMULATE
 	bool "Emulate SWP/SWPB instructions"
-	depends on CPU_V7 && !CPU_V6
+	depends on !CPU_USE_DOMAINS && CPU_V7 && !CPU_V6
 	select HAVE_PROC_CPU if PROC_FS
 	default y if SMP
 	help