diff options
| author | Lennert Buytenhek <buytenh@wantstofly.org> | 2010-10-15 10:50:26 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nico@fluxnic.net> | 2011-03-03 16:27:01 -0500 |
| commit | 4ee1f6b574765a6c97f945e6b0277e5ccac38cb5 (patch) | |
| tree | c5e0667c637bd13ddcaca694a571b82254e278eb /arch/arm/mach-orion5x/ts209-setup.c | |
| parent | 40ff15a6cb9e7e84b72ef962d9d27551fb00f54b (diff) | |
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/ts209-setup.c')
| -rw-r--r-- | arch/arm/mach-orion5x/ts209-setup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c index 1e196129d763..8bbd27ea6735 100644 --- a/arch/arm/mach-orion5x/ts209-setup.c +++ b/arch/arm/mach-orion5x/ts209-setup.c | |||
| @@ -325,6 +325,7 @@ MACHINE_START(TS209, "QNAP TS-109/TS-209") | |||
| 325 | .boot_params = 0x00000100, | 325 | .boot_params = 0x00000100, |
| 326 | .init_machine = qnap_ts209_init, | 326 | .init_machine = qnap_ts209_init, |
| 327 | .map_io = orion5x_map_io, | 327 | .map_io = orion5x_map_io, |
| 328 | .init_early = orion5x_init_early, | ||
| 328 | .init_irq = orion5x_init_irq, | 329 | .init_irq = orion5x_init_irq, |
| 329 | .timer = &orion5x_timer, | 330 | .timer = &orion5x_timer, |
| 330 | .fixup = tag_fixup_mem32, | 331 | .fixup = tag_fixup_mem32, |