aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-orion5x/mss2-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 16:27:01 -0500
commit4ee1f6b574765a6c97f945e6b0277e5ccac38cb5 (patch)
treec5e0667c637bd13ddcaca694a571b82254e278eb /arch/arm/mach-orion5x/mss2-setup.c
parent40ff15a6cb9e7e84b72ef962d9d27551fb00f54b (diff)
downloadkernel_goldelico_gta04-4ee1f6b574765a6c97f945e6b0277e5ccac38cb5.zip
kernel_goldelico_gta04-4ee1f6b574765a6c97f945e6b0277e5ccac38cb5.tar.gz
kernel_goldelico_gta04-4ee1f6b574765a6c97f945e6b0277e5ccac38cb5.tar.bz2
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-orion5x/mss2-setup.c')
-rw-r--r--arch/arm/mach-orion5x/mss2-setup.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-orion5x/mss2-setup.c b/arch/arm/mach-orion5x/mss2-setup.c
index 2f0e16c..b43b208 100644
--- a/arch/arm/mach-orion5x/mss2-setup.c
+++ b/arch/arm/mach-orion5x/mss2-setup.c
@@ -264,6 +264,7 @@ MACHINE_START(MSS2, "Maxtor Shared Storage II")
.boot_params = 0x00000100,
.init_machine = mss2_init,
.map_io = orion5x_map_io,
+ .init_early = orion5x_init_early,
.init_irq = orion5x_init_irq,
.timer = &orion5x_timer,
.fixup = tag_fixup_mem32