---

yaml --- r: 362180 b: refs/heads/master c: 698613b h: refs/heads/master v: v3
git-mirror · Apr 3, 2013 · 59115b8 · 59115b8
1 parent 047d674
commit 59115b8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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.