diff options
| author | Ryan Mallon <ryan@bluewatersys.com> | 2009-07-15 21:51:59 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-07-17 13:35:59 +0100 |
| commit | fbeeea5386ab213bd55b223f3a75c823fccd6df5 (patch) | |
| tree | 461a11076094589136b0bd0febb6e71c6763ef41 /arch/arm/mach-ep93xx | |
| parent | 595c050d89e91e91cca3845e48b01042677bd19e (diff) | |
| download | op-kernel-dev-fbeeea5386ab213bd55b223f3a75c823fccd6df5.zip op-kernel-dev-fbeeea5386ab213bd55b223f3a75c823fccd6df5.tar.gz | |
[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 <ryan@bluewatersys.com>
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-ep93xx')
| -rw-r--r-- | arch/arm/mach-ep93xx/core.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ep93xx/include/mach/platform.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c index 4c38941..b390c35 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 fb5e59a..0af0a3b 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) |
