diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-09-14 20:16:39 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-19 15:11:54 +0200 |
commit | b7a3f8db07c1bca303dbf038f108dd84638bcd82 (patch) | |
tree | 8b17e960201ad2d76f4fb26be76ba4aa7487599a /arch/arm/mach-integrator/core.c | |
parent | f25d696aed301a38f744d6e4f661e45736a12a1c (diff) | |
download | linux-b7a3f8db07c1bca303dbf038f108dd84638bcd82.tar.bz2 |
ARM: integrator: use __iomem pointers for MMIO
ARM is moving to stricter checks on readl/write functions,
so we need to use the correct types everywhere.
This patch has a few small conflicts with stuff in linux-next, which
we have to sort out in arm-soc.
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-integrator/core.c')
-rw-r--r-- | arch/arm/mach-integrator/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c index 3fa6c51390da..a432d4325f89 100644 --- a/arch/arm/mach-integrator/core.c +++ b/arch/arm/mach-integrator/core.c @@ -95,8 +95,8 @@ arch_initcall(integrator_init); * UART0 7 6 * UART1 5 4 */ -#define SC_CTRLC IO_ADDRESS(INTEGRATOR_SC_CTRLC) -#define SC_CTRLS IO_ADDRESS(INTEGRATOR_SC_CTRLS) +#define SC_CTRLC __io_address(INTEGRATOR_SC_CTRLC) +#define SC_CTRLS __io_address(INTEGRATOR_SC_CTRLS) static void integrator_uart_set_mctrl(struct amba_device *dev, void __iomem *base, unsigned int mctrl) { |