From 7147975928a32c69fb58c3892a991d5b7eb459e7 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 14 Mar 2012 01:05:42 +0100
Subject: [PATCH] --- yaml --- r: 295801 b: refs/heads/master c:
 a6e24019468009a21b674e392d74283a90f415dd h: refs/heads/master i:   295799:
 f9b054fd817ea1c7b18bf14432ebdb8c1c155308 v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/arm/mach-shmobile/setup-r8a7779.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 753512e737be..d26689577175 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2854903ad1329d09d7ec35639fff0949e45d496d
+refs/heads/master: a6e24019468009a21b674e392d74283a90f415dd
diff --git a/trunk/arch/arm/mach-shmobile/setup-r8a7779.c b/trunk/arch/arm/mach-shmobile/setup-r8a7779.c
index ce57d90c4bbc..6820d785493d 100644
--- a/trunk/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/trunk/arch/arm/mach-shmobile/setup-r8a7779.c
@@ -246,7 +246,7 @@ void __init r8a7779_add_standard_devices(void)
 {
 #ifdef CONFIG_CACHE_L2X0
 	/* Early BRESP enable, Shared attribute override enable, 64K*16way */
-	l2x0_init(__io(0xf0100000), 0x40470000, 0x82000fff);
+	l2x0_init((void __iomem __force *)(0xf0100000), 0x40470000, 0x82000fff);
 #endif
 	r8a7779_pm_init();