diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2011-06-07 10:40:51 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-06-09 11:15:06 +0200 |
| commit | 6075e9df471e35f2ebf4c73c95c304d0473bd4b2 (patch) | |
| tree | 5e42fba380df72f7295263454ff220ae3ddbb7a6 /arch/arm/mach-u300/clock.h | |
| parent | Revert "ARM: 6944/1: mm: allow ASID 0 to be allocated to tasks" (diff) | |
| download | linux-6075e9df471e35f2ebf4c73c95c304d0473bd4b2.tar.xz linux-6075e9df471e35f2ebf4c73c95c304d0473bd4b2.zip | |
ARM: 6949/2: mach-u300: fix compilaton warning in IO accessors
The IO accessors for U300 were using u32 rather than the nominal
void __iomem * type, rectify this by properly defining the
virtual base for statically mapped peripherals to be
void __iomem *. Requires fixing a field in struct clk as well.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-u300/clock.h')
| -rw-r--r-- | arch/arm/mach-u300/clock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-u300/clock.h b/arch/arm/mach-u300/clock.h index c34f3ea3017c..4f50ca8f901e 100644 --- a/arch/arm/mach-u300/clock.h +++ b/arch/arm/mach-u300/clock.h @@ -31,7 +31,7 @@ struct clk { bool reset; __u16 clk_val; __s8 usecount; - __u32 res_reg; + void __iomem * res_reg; __u16 res_mask; bool hw_ctrld; |