diff --git a/[refs] b/[refs]
index 49e951c270bc..05d47f7048d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5924486dc0f205ebc2bbf4c262eec902ff38e802
+refs/heads/master: 3b93e7b08fc3e87e5b451ee5e47cfe142779d0cd
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index 3d1a3fb7d5fc..40943e19918f 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -339,6 +339,10 @@ config XSCALE_PMU
 	depends on CPU_XSCALE && !XSCALE_PMU_TIMER
 	default y
 
+if !MMU
+source "arch/arm/Kconfig-nommu"
+endif
+
 endmenu
 
 source "arch/arm/common/Kconfig"