diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-08 13:49:04 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-08 13:57:04 +0000 |
commit | a0b7bd0829194c03921915a68ee4a331ee394223 (patch) | |
tree | 0d7a3dddfa6018ae1230b6082041a93ed21eb1b4 /arch/arm/mach-davinci/include/mach/io.h | |
parent | cf7d7e5a1980d1116ee152d25dac382b112b9c17 (diff) | |
download | blackbird-op-linux-a0b7bd0829194c03921915a68ee4a331ee394223.tar.gz blackbird-op-linux-a0b7bd0829194c03921915a68ee4a331ee394223.zip |
ARM: io: make iounmap() a simple macro
Defining iounmap() with arguments prevents it from being used as a
function pointer, causing platforms to work around this. Instead,
define it to be a simple macro.
Do the same for __arch_io(re|un)map too.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-davinci/include/mach/io.h')
-rw-r--r-- | arch/arm/mach-davinci/include/mach/io.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/include/mach/io.h b/arch/arm/mach-davinci/include/mach/io.h index 62b0a90309ad..d1b954955c12 100644 --- a/arch/arm/mach-davinci/include/mach/io.h +++ b/arch/arm/mach-davinci/include/mach/io.h @@ -22,8 +22,8 @@ #define __mem_isa(a) (a) #ifndef __ASSEMBLER__ -#define __arch_ioremap(p, s, t) davinci_ioremap(p, s, t) -#define __arch_iounmap(v) davinci_iounmap(v) +#define __arch_ioremap davinci_ioremap +#define __arch_iounmap davinci_iounmap void __iomem *davinci_ioremap(unsigned long phys, size_t size, unsigned int type); |