From fbeeea5386ab213bd55b223f3a75c823fccd6df5 Mon Sep 17 00:00:00 2001 From: Ryan Mallon Date: Wed, 15 Jul 2009 21:51:59 +0100 Subject: [ARM] 5607/1: ep93xx: Use __iomem pointer on syscon write function Change the reg argument of the ep93xx_syscon_swlocked_write function to be an __iomem pointer. Fixes a number of build warnings. Signed-off-by: Ryan Mallon Acked-by: H Hartley Sweeten Signed-off-by: Russell King --- arch/arm/mach-ep93xx/core.c | 2 +- arch/arm/mach-ep93xx/include/mach/platform.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/arm/mach-ep93xx') diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c index 4c38941a92c..b390c35f8bc 100644 --- a/arch/arm/mach-ep93xx/core.c +++ b/arch/arm/mach-ep93xx/core.c @@ -377,7 +377,7 @@ void __init ep93xx_init_irq(void) */ static DEFINE_SPINLOCK(syscon_swlock); -void ep93xx_syscon_swlocked_write(unsigned int val, unsigned int reg) +void ep93xx_syscon_swlocked_write(unsigned int val, void __iomem *reg) { unsigned long flags; diff --git a/arch/arm/mach-ep93xx/include/mach/platform.h b/arch/arm/mach-ep93xx/include/mach/platform.h index fb5e59a3ea0..0af0a3ba704 100644 --- a/arch/arm/mach-ep93xx/include/mach/platform.h +++ b/arch/arm/mach-ep93xx/include/mach/platform.h @@ -17,7 +17,7 @@ void ep93xx_init_irq(void); void ep93xx_init_time(unsigned long); /* EP93xx System Controller software locked register write */ -void ep93xx_syscon_swlocked_write(unsigned int val, unsigned int reg); +void ep93xx_syscon_swlocked_write(unsigned int val, void __iomem *reg); void ep93xx_devcfg_set_clear(unsigned int set_bits, unsigned int clear_bits); static inline void ep93xx_devcfg_set_bits(unsigned int bits) -- cgit