diff options
| author |   Olof Johansson <olof@lixom.net> | 2012-11-06 06:48:05 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-06 06:48:05 -0800 |
| commit | 3b19119b95a52200c8ae3df3aa89c21c9a1a8894 (patch) | |
| tree | 3ae74b8a35b3d1f639a68c1690af1c06e14a1571 /arch/arm/mach-shmobile | |
| parent | Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc (diff) | |
| parent | ARM: highbank: Add initial ECX-2000 support (diff) | |
| download | linux-dev-3b19119b95a52200c8ae3df3aa89c21c9a1a8894.tar.xz linux-dev-3b19119b95a52200c8ae3df3aa89c21c9a1a8894.zip | |
Merge tag 'calxeda-ecx-2000' of git://sources.calxeda.com/kernel/linux into next/soc
Support for Calxeda ECX-2000 SOC from Rob Herring
* tag 'calxeda-ecx-2000' of git://sources.calxeda.com/kernel/linux:
ARM: highbank: Add initial ECX-2000 support
ARM: highbank: abstract out SCU usage
ARM: smp_twd: don't warn on no DT node
ARM: dts: Add Calxeda ECX-2000 support
ARM: highbank: enable coherent DMA for xgmac in dts
ARM: highbank: disable unused sdhci and gpio in dts
+ sync to Linux 3.7-rc3
Diffstat (limited to 'arch/arm/mach-shmobile')
| -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 63de5cb28e4a..7a1ad4f38539 100644 --- a/arch/arm/mach-shmobile/setup-r8a7779.c +++ b/arch/arm/mach-shmobile/setup-r8a7779.c @@ -324,7 +324,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(); |