summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mv78xx0/rd78x00-masa-setup.c
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2010-10-15 16:50:26 +0200
committerNicolas Pitre <nico@fluxnic.net>2011-03-03 22:27:01 +0100
commit4ee1f6b574765a6c97f945e6b0277e5ccac38cb5 (patch)
treec5e0667c637bd13ddcaca694a571b82254e278eb /arch/arm/mach-mv78xx0/rd78x00-masa-setup.c
parent[ARM] Kirkwood: add LaCie d2 Network v2 to defconfig (diff)
downloadlinux-4ee1f6b574765a6c97f945e6b0277e5ccac38cb5.tar.xz
linux-4ee1f6b574765a6c97f945e6b0277e5ccac38cb5.zip
ARM: Remove dependency of plat-orion time code on mach directory includes.
This patch makes the various mach dirs that use the plat-orion time code pass in timer and bridge addresses explicitly, instead of having plat-orion get those values by including a mach dir include file -- the latter mechanism is problematic if you want to support multiple ARM platforms in the same kernel image. Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca> Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
Diffstat (limited to 'arch/arm/mach-mv78xx0/rd78x00-masa-setup.c')
-rw-r--r--arch/arm/mach-mv78xx0/rd78x00-masa-setup.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-mv78xx0/rd78x00-masa-setup.c b/arch/arm/mach-mv78xx0/rd78x00-masa-setup.c
index 3511ad4d973b..d927f14c6810 100644
--- a/arch/arm/mach-mv78xx0/rd78x00-masa-setup.c
+++ b/arch/arm/mach-mv78xx0/rd78x00-masa-setup.c
@@ -81,6 +81,7 @@ MACHINE_START(RD78X00_MASA, "Marvell RD-78x00-MASA Development Board")
.boot_params = 0x00000100,
.init_machine = rd78x00_masa_init,
.map_io = mv78xx0_map_io,
+ .init_early = mv78xx0_init_early,
.init_irq = mv78xx0_init_irq,
.timer = &mv78xx0_timer,
MACHINE_END