aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/include/asm/io.h
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-01-28 04:17:29 -0500
committerPaul Mundt <lethal@linux-sh.org>2010-01-28 04:17:29 -0500
commitd627a2ebd1a303aa4ac1962c553d1e8738735d01 (patch)
treecd39ccbf914e79fe27e7adda701c74f0469bbca4 /arch/sh/include/asm/io.h
parent849593591ce3b5f9352966c9d410284dc04d03b6 (diff)
sh: Fix up the ioremap_fixed() build for nommu.
arch/sh/kernel/setup.c:455: error: implicit declaration of function 'ioremap_fixed_init' Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/include/asm/io.h')
-rw-r--r--arch/sh/include/asm/io.h36
1 files changed, 18 insertions, 18 deletions
diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h
index 98c62fa168c2..bd5fafa23eb4 100644
--- a/arch/sh/include/asm/io.h
+++ b/arch/sh/include/asm/io.h
@@ -273,24 +273,6 @@ void __iomem *__ioremap_caller(unsigned long offset, unsigned long size,
273 pgprot_t prot, void *caller); 273 pgprot_t prot, void *caller);
274void __iounmap(void __iomem *addr); 274void __iounmap(void __iomem *addr);
275 275
276#ifdef CONFIG_IOREMAP_FIXED
277extern void __iomem *ioremap_fixed(resource_size_t, unsigned long,
278 unsigned long, pgprot_t);
279extern int iounmap_fixed(void __iomem *);
280extern void ioremap_fixed_init(void);
281#else
282static inline void __iomem *
283ioremap_fixed(resource_size_t phys_addr, unsigned long offset,
284 unsigned long size, pgprot_t prot)
285{
286 BUG();
287 return NULL;
288}
289
290static inline void ioremap_fixed_init(void) { }
291static inline int iounmap_fixed(void __iomem *addr) { return -EINVAL; }
292#endif
293
294static inline void __iomem * 276static inline void __iomem *
295__ioremap(unsigned long offset, unsigned long size, pgprot_t prot) 277__ioremap(unsigned long offset, unsigned long size, pgprot_t prot)
296{ 278{
@@ -365,6 +347,24 @@ ioremap_prot(resource_size_t offset, unsigned long size, unsigned long flags)
365} 347}
366#endif 348#endif
367 349
350#ifdef CONFIG_IOREMAP_FIXED
351extern void __iomem *ioremap_fixed(resource_size_t, unsigned long,
352 unsigned long, pgprot_t);
353extern int iounmap_fixed(void __iomem *);
354extern void ioremap_fixed_init(void);
355#else
356static inline void __iomem *
357ioremap_fixed(resource_size_t phys_addr, unsigned long offset,
358 unsigned long size, pgprot_t prot)
359{
360 BUG();
361 return NULL;
362}
363
364static inline void ioremap_fixed_init(void) { }
365static inline int iounmap_fixed(void __iomem *addr) { return -EINVAL; }
366#endif
367
368#define ioremap_nocache ioremap 368#define ioremap_nocache ioremap
369#define iounmap __iounmap 369#define iounmap __iounmap
370 370