diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-08 14:49:04 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-08 14:57:04 +0100 |
commit | a0b7bd0829194c03921915a68ee4a331ee394223 (patch) | |
tree | 0d7a3dddfa6018ae1230b6082041a93ed21eb1b4 /arch/arm/mach-iop32x | |
parent | Linux 2.6.37-rc5 (diff) | |
download | linux-a0b7bd0829194c03921915a68ee4a331ee394223.tar.xz 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-iop32x')
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/io.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-iop32x/include/mach/io.h b/arch/arm/mach-iop32x/include/mach/io.h index 339e5854728b..059c783ce0b2 100644 --- a/arch/arm/mach-iop32x/include/mach/io.h +++ b/arch/arm/mach-iop32x/include/mach/io.h @@ -21,7 +21,7 @@ extern void __iop3xx_iounmap(void __iomem *addr); #define __io(p) ((void __iomem *)IOP3XX_PCI_IO_PHYS_TO_VIRT(p)) #define __mem_pci(a) (a) -#define __arch_ioremap(a, s, f) __iop3xx_ioremap(a, s, f) -#define __arch_iounmap(a) __iop3xx_iounmap(a) +#define __arch_ioremap __iop3xx_ioremap +#define __arch_iounmap __iop3xx_iounmap #endif |