From 59115b8254c65815a58b0f482caaf3e6cd460939 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Wed, 3 Apr 2013 16:33:26 +0100
Subject: [PATCH] --- yaml --- r: 362180 b: refs/heads/master c:
 698613b63817f2f6ca79831cd1c37aae67025323 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a5c9bf569fb6..342ef6dc4176 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68a154fc53ddd3f7b33e482847a411bf54a50855
+refs/heads/master: 698613b63817f2f6ca79831cd1c37aae67025323
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index 13b739469c51..12ea3b3d49a9 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -1183,9 +1183,9 @@ config ARM_NR_BANKS
 	default 8
 
 config IWMMXT
-	bool "Enable iWMMXt support"
+	bool "Enable iWMMXt support" if !CPU_PJ4
 	depends on CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_PJ4
-	default y if PXA27x || PXA3xx || ARCH_MMP
+	default y if PXA27x || PXA3xx || ARCH_MMP || CPU_PJ4
 	help
 	  Enable support for iWMMXt context switching at run time if
 	  running on a CPU that supports it.