diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-10-26 15:11:30 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-10-26 15:11:30 +0200 |
| commit | 1dc506a551273b6d7638a09036188554f564d5ec (patch) | |
| tree | 935a167f4638e0fd928634d2205f47958213b534 | |
| parent | 389a84d2c1c62f0232b5239017c81ee88b2613ae (diff) | |
| parent | ed7d132a634e7e4c3fa657363df5df39e7f768e4 (diff) | |
| download | op-kernel-dev-1dc506a551273b6d7638a09036188554f564d5ec.zip op-kernel-dev-1dc506a551273b6d7638a09036188554f564d5ec.tar.gz | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: r8a7779: I/O address abuse cleanup
| -rw-r--r-- | arch/arm/mach-shmobile/setup-r8a7779.c | 2 |
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 2917668..ebbffc2 100644 --- a/arch/arm/mach-shmobile/setup-r8a7779.c +++ b/arch/arm/mach-shmobile/setup-r8a7779.c @@ -247,7 +247,7 @@ void __init r8a7779_add_standard_devices(void) { #ifdef CONFIG_CACHE_L2X0 /* Early BRESP enable, Shared attribute override enable, 64K*16way */ - l2x0_init((void __iomem __force *)(0xf0100000), 0x40470000, 0x82000fff); + l2x0_init(IOMEM(0xf0100000), 0x40470000, 0x82000fff); #endif r8a7779_pm_init(); |
