Commit 1dc506a5 authored by Arnd Bergmann's avatar Arnd Bergmann

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
parents 389a84d2 ed7d132a
...@@ -247,7 +247,7 @@ void __init r8a7779_add_standard_devices(void) ...@@ -247,7 +247,7 @@ void __init r8a7779_add_standard_devices(void)
{ {
#ifdef CONFIG_CACHE_L2X0 #ifdef CONFIG_CACHE_L2X0
/* Early BRESP enable, Shared attribute override enable, 64K*16way */ /* Early BRESP enable, Shared attribute override enable, 64K*16way */
l2x0_init((void __iomem __force *)(0xf0100000), 0x40470000, 0x82000fff); l2x0_init(IOMEM(0xf0100000), 0x40470000, 0x82000fff);
#endif #endif
r8a7779_pm_init(); r8a7779_pm_init();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment