From 4b43917651f040307764de709b8bc949535c7011 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 23 Sep 2011 10:13:49 +0200
Subject: [PATCH] --- yaml --- r: 264584 b: refs/heads/master c:
 d4f3add28bd90caddd5a39e422aed621d57f89a8 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/arch/arm/common/vic.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9b98fe50cad1..c6016f77200e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53eebb0df85e4005006920ae12150e8d6d31b132
+refs/heads/master: d4f3add28bd90caddd5a39e422aed621d57f89a8
diff --git a/trunk/arch/arm/common/vic.c b/trunk/arch/arm/common/vic.c
index 7aa4262ada7a..adccf6d002b8 100644
--- a/trunk/arch/arm/common/vic.c
+++ b/trunk/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;