2 files changed, 3 insertions, 2 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index fdcd2d54e939..5385d8743c6a 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -712,8 +712,8 @@ source arch/arm/mm/Kconfig
 
 config IWMMXT
         bool "Enable iWMMXt support"
-        depends on CPU_XSCALE || CPU_XSC3
-        default y if PXA27x || PXA3xx
+        depends on CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK
+        default y if PXA27x || PXA3xx || ARCH_MMP
         help
           Enable support for iWMMXt context switching at run time if
           running on a CPU that supports it.
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
index ca60d335e8fa..11a5197a221f 100644
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@ -36,6 +36,7 @@ AFLAGS_crunch-bits.o		:= -Wa,-mcpu=ep9312
 
 obj-$(CONFIG_CPU_XSCALE)        += xscale-cp0.o
 obj-$(CONFIG_CPU_XSC3)          += xscale-cp0.o
+obj-$(CONFIG_CPU_MOHAWK)        += xscale-cp0.o
 obj-$(CONFIG_IWMMXT)            += iwmmxt.o
 AFLAGS_iwmmxt.o                 := -Wa,-mcpu=iwmmxt