diff --git a/[refs] b/[refs]
index e3a93b01fa37..7cc5e6afe257 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b406efefd5246a67c691fd79871e65ce8f3f91ff
+refs/heads/master: 2194478157127d52338be96ac9436dc54005816a
diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig
index 18a1cc8a6aa3..adef42cd507f 100644
--- a/trunk/arch/sh/Kconfig
+++ b/trunk/arch/sh/Kconfig
@@ -12,7 +12,7 @@ config SUPERH
 	select HAVE_IDE
 	select HAVE_OPROFILE
 	select HAVE_GENERIC_DMA_COHERENT
-	select HAVE_IOREMAP_PROT
+	select HAVE_IOREMAP_PROT if MMU
 	help
 	  The SuperH is a RISC processor targeted for use in embedded systems
 	  and consumer electronics; it was also used in the Sega Dreamcast