2 files changed, 9 insertions, 9 deletions

diff --git a/arch/sh/boards/Kconfig b/arch/sh/boards/Kconfig
index dcc1af8a2cfe..99e2d47f79f5 100644
--- a/arch/sh/boards/Kconfig
+++ b/arch/sh/boards/Kconfig
@@ -121,7 +121,7 @@ config SH_RTS7751R2D
         bool "RTS7751R2D"
         depends on CPU_SUBTYPE_SH7751R
         select SYS_SUPPORTS_PCI
-        select IO_TRAPPED
+        select IO_TRAPPED if MMU
         help
           Select RTS7751R2D if configuring for a Renesas Technology
           Sales SH-Graphics board.
@@ -145,13 +145,13 @@ config SH_HIGHLANDER
         bool "Highlander"
         depends on CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785
         select SYS_SUPPORTS_PCI
-        select IO_TRAPPED
+        select IO_TRAPPED if MMU
 
 config SH_SH7785LCR
         bool "SH7785LCR"
         depends on CPU_SUBTYPE_SH7785
         select SYS_SUPPORTS_PCI
-        select IO_TRAPPED
+        select IO_TRAPPED if MMU
 
 config SH_SH7785LCR_29BIT_PHYSMAPS
         bool "SH7785LCR 29bit physmaps"
diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h
index 0454f8d68059..ef217344afcb 100644
--- a/arch/sh/include/asm/io.h
+++ b/arch/sh/include/asm/io.h
@@ -228,12 +228,6 @@ void __iounmap(void __iomem *addr);
 unsigned long onchip_remap(unsigned long addr, unsigned long size,
                            const char *name);
 extern void onchip_unmap(unsigned long vaddr);
-#else
-#define __ioremap(offset, size, flags)  ((void __iomem *)(offset))
-#define __iounmap(addr)                 do { } while (0)
-#define onchip_remap(addr, size, name)  (addr)
-#define onchip_unmap(addr)              do { } while (0)
-#endif /* CONFIG_MMU */
 
 static inline void __iomem *
 __ioremap_mode(unsigned long offset, unsigned long size, unsigned long flags)
@@ -268,6 +262,12 @@ __ioremap_mode(unsigned long offset, unsigned long size, unsigned long flags)
 
         return __ioremap(offset, size, flags);
 }
+#else
+#define onchip_remap(addr, size, name)          (addr)
+#define onchip_unmap(addr)                      do { } while (0)
+#define __ioremap_mode(offset, size, flags)     ((void __iomem *)(offset))
+#define __iounmap(addr)                         do { } while (0)
+#endif /* CONFIG_MMU */
 
 #define ioremap(offset, size)                           \
         __ioremap_mode((offset), (size), 0)