diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-01-28 18:17:29 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-01-28 18:17:29 +0900 |
commit | d627a2ebd1a303aa4ac1962c553d1e8738735d01 (patch) | |
tree | cd39ccbf914e79fe27e7adda701c74f0469bbca4 /arch/sh/include/asm/io.h | |
parent | 849593591ce3b5f9352966c9d410284dc04d03b6 (diff) | |
download | kernel_samsung_smdk4412-d627a2ebd1a303aa4ac1962c553d1e8738735d01.zip kernel_samsung_smdk4412-d627a2ebd1a303aa4ac1962c553d1e8738735d01.tar.gz kernel_samsung_smdk4412-d627a2ebd1a303aa4ac1962c553d1e8738735d01.tar.bz2 |
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.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h index 98c62fa..bd5fafa 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, pgprot_t prot, void *caller); void __iounmap(void __iomem *addr); -#ifdef CONFIG_IOREMAP_FIXED -extern void __iomem *ioremap_fixed(resource_size_t, unsigned long, - unsigned long, pgprot_t); -extern int iounmap_fixed(void __iomem *); -extern void ioremap_fixed_init(void); -#else -static inline void __iomem * -ioremap_fixed(resource_size_t phys_addr, unsigned long offset, - unsigned long size, pgprot_t prot) -{ - BUG(); - return NULL; -} - -static inline void ioremap_fixed_init(void) { } -static inline int iounmap_fixed(void __iomem *addr) { return -EINVAL; } -#endif - static inline void __iomem * __ioremap(unsigned long offset, unsigned long size, pgprot_t prot) { @@ -365,6 +347,24 @@ ioremap_prot(resource_size_t offset, unsigned long size, unsigned long flags) } #endif +#ifdef CONFIG_IOREMAP_FIXED +extern void __iomem *ioremap_fixed(resource_size_t, unsigned long, + unsigned long, pgprot_t); +extern int iounmap_fixed(void __iomem *); +extern void ioremap_fixed_init(void); +#else +static inline void __iomem * +ioremap_fixed(resource_size_t phys_addr, unsigned long offset, + unsigned long size, pgprot_t prot) +{ + BUG(); + return NULL; +} + +static inline void ioremap_fixed_init(void) { } +static inline int iounmap_fixed(void __iomem *addr) { return -EINVAL; } +#endif + #define ioremap_nocache ioremap #define iounmap __iounmap |