diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-09-23 10:13:49 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-01 21:11:30 +0200 |
| commit | d4f3add28bd90caddd5a39e422aed621d57f89a8 (patch) | |
| tree | 70461c5a80ecc0e2cfbd483e41af7e687c954807 /arch/arm/common | |
| parent | 53eebb0df85e4005006920ae12150e8d6d31b132 (diff) | |
| download | blackbird-obmc-linux-d4f3add28bd90caddd5a39e422aed621d57f89a8.tar.gz blackbird-obmc-linux-d4f3add28bd90caddd5a39e422aed621d57f89a8.zip | |
ARM: common/vic: use proper __iomem annotations
In vic_init, we pass addr into readl, so it needs to be a
pointer, not a u32 address.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/common')
| -rw-r--r-- | arch/arm/common/vic.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/common/vic.c b/arch/arm/common/vic.c index 7aa4262ada7a..adccf6d002b8 100644 --- a/arch/arm/common/vic.c +++ b/arch/arm/common/vic.c @@ -347,7 +347,8 @@ void __init vic_init(void __iomem *base, unsigned int irq_start, /* Identify which VIC cell this one is, by reading the ID */ for (i = 0; i < 4; i++) { - u32 addr = ((u32)base & PAGE_MASK) + 0xfe0 + (i * 4); + void __iomem *addr; + addr = (void __iomem *)((u32)base & PAGE_MASK) + 0xfe0 + (i * 4); cellid |= (readl(addr) & 0xff) << (8 * i); } vendor = (cellid >> 12) & 0xff; |
