summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-03-14 01:05:42 +0100
committerRafael J. Wysocki <rjw@sisk.pl>2012-03-14 01:05:42 +0100
commita6e24019468009a21b674e392d74283a90f415dd (patch)
treee35bc23632cede6fd0e560d7469bc59c3b282006 /arch/arm
parentARM: mach-shmobile: default to no earlytimer (diff)
downloadlinux-a6e24019468009a21b674e392d74283a90f415dd.tar.xz
linux-a6e24019468009a21b674e392d74283a90f415dd.zip
ARM: shmobile: remove additional __io() macro use
setup-r8a7779.c has grown a new user of the __io() macro. Rob Herring's PIO cleanup series already gets rid of all other uses in shmobile, so we should ensure that this one gets removed as well. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-shmobile/setup-r8a7779.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c
index ce57d90c4bbc..6820d785493d 100644
--- a/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/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();