From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 18 Jan 2010 12:20:13 +0000 (+0900)
Subject: sh: Fixup the IOREMAP_FIXED=n build.
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=edf711b66f2a8a9629aa253ad8b3a5a03b5d7af5;p=deliverable%2Flinux.git

sh: Fixup the IOREMAP_FIXED=n build.

Presently the fixed ioremap API is only defined when CONFIG_IOREMAP_FIXED
is set. As we want to call in to it unconditionally, provide a stubbed
out interface.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h
index bee5965e0a82..9aa9438c66c3 100644
--- a/arch/sh/include/asm/io.h
+++ b/arch/sh/include/asm/io.h
@@ -241,6 +241,15 @@ void __iounmap(void __iomem *addr);
 extern void __iomem *ioremap_fixed(resource_size_t, unsigned long, pgprot_t);
 extern void iounmap_fixed(void __iomem *);
 extern void ioremap_fixed_init(void);
+#else
+static inline void __iomem *
+ioremap_fixed(resource_size t phys_addr, unsigned long size, pgprot_t prot)
+{
+	BUG();
+}
+
+static inline void ioremap_fixed_init(void) { }
+static inline void iounmap_fixed(void __iomem *addr) { }
 #endif
 
 static inline void __iomem *