diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-11-07 16:10:56 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-11-07 16:10:56 +0000 |
| commit | 725278e0ecdabbbced6f1b05a23473ec9e4cafee (patch) | |
| tree | 6f0843aa39f5a2df292613b9ed0b537be5047301 /arch/arm/mach-kirkwood/netspace_v2-setup.c | |
| parent | c947f69fff183e5d2a06160d9262b5dab7359e95 (diff) | |
| parent | 7350f419724fd9472d3b5cc521538713f9797b62 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion
Diffstat (limited to 'arch/arm/mach-kirkwood/netspace_v2-setup.c')
| -rw-r--r-- | arch/arm/mach-kirkwood/netspace_v2-setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-kirkwood/netspace_v2-setup.c b/arch/arm/mach-kirkwood/netspace_v2-setup.c index 5ea66f1f417..65ee21fd2f3 100644 --- a/arch/arm/mach-kirkwood/netspace_v2-setup.c +++ b/arch/arm/mach-kirkwood/netspace_v2-setup.c @@ -262,7 +262,7 @@ MACHINE_START(NETSPACE_V2, "LaCie Network Space v2") .init_machine = netspace_v2_init, .map_io = kirkwood_map_io, .init_irq = kirkwood_init_irq, - .timer = &lacie_v2_timer, + .timer = &kirkwood_timer, MACHINE_END #endif @@ -272,7 +272,7 @@ MACHINE_START(INETSPACE_V2, "LaCie Internet Space v2") .init_machine = netspace_v2_init, .map_io = kirkwood_map_io, .init_irq = kirkwood_init_irq, - .timer = &lacie_v2_timer, + .timer = &kirkwood_timer, MACHINE_END #endif @@ -282,6 +282,6 @@ MACHINE_START(NETSPACE_MAX_V2, "LaCie Network Space Max v2") .init_machine = netspace_v2_init, .map_io = kirkwood_map_io, .init_irq = kirkwood_init_irq, - .timer = &lacie_v2_timer, + .timer = &kirkwood_timer, MACHINE_END #endif |