---

yaml --- r: 181113 b: refs/heads/master c: 6d63e73 h: refs/heads/master i: 181111: e565ff3 v: v3
git-mirror · Jan 19, 2010 · 4896a3a · 4896a3a
1 parent a93f2c0
commit 4896a3a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f33609344acfdde1c1acedf6de3efe6b80af93a6
+refs/heads/master: 6d63e73d520b690e4378cef3003eb5f01f7d128c
diff --git a/trunk/arch/sh/Kconfig b/trunk/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/trunk/arch/sh/include/asm/io.h b/trunk/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