diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 5ac0115c9e202620ba023eae5183c815e326cd9f..8d0eabbf7460ef93a56f9644697ff1000cc5e80c 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -13,7 +13,6 @@ config SUPERH
 	select HAVE_LMB
 	select HAVE_OPROFILE
 	select HAVE_GENERIC_DMA_COHERENT
-	select HAVE_IOREMAP_PROT if MMU
 	select HAVE_ARCH_TRACEHOOK
 	select HAVE_DMA_API_DEBUG
 	select HAVE_DMA_ATTRS
@@ -36,6 +35,7 @@ config SUPERH32
 	def_bool ARCH = "sh"
 	select HAVE_KPROBES
 	select HAVE_KRETPROBES
+	select HAVE_IOREMAP_PROT if MMU && !X2TLB
 	select HAVE_FUNCTION_TRACER
 	select HAVE_FTRACE_MCOUNT_RECORD
 	select HAVE_DYNAMIC_FTRACE
diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h
index c32a55601d01c4d984db9a2748654e56a044478f..4bad72a1b39e94433c7bbe825552f9651b632728 100644
--- a/arch/sh/include/asm/io.h
+++ b/arch/sh/include/asm/io.h
@@ -321,11 +321,13 @@ ioremap_cache(unsigned long offset, unsigned long size)
 	return __ioremap_mode(offset, size, PAGE_KERNEL);
 }
 
+#ifdef CONFIG_HAVE_IOREMAP_PROT
 static inline void __iomem *
 ioremap_prot(resource_size_t offset, unsigned long size, unsigned long flags)
 {
 	return __ioremap_mode(offset, size, __pgprot(flags));
 }
+#endif
 
 #define ioremap_nocache	ioremap
 #define iounmap		__iounmap