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/netxbig_v2-setup.c | |
| parent | c947f69fff183e5d2a06160d9262b5dab7359e95 (diff) | |
| parent | 7350f419724fd9472d3b5cc521538713f9797b62 (diff) | |
| download | kernel_samsung_smdk4412-725278e0ecdabbbced6f1b05a23473ec9e4cafee.zip kernel_samsung_smdk4412-725278e0ecdabbbced6f1b05a23473ec9e4cafee.tar.gz kernel_samsung_smdk4412-725278e0ecdabbbced6f1b05a23473ec9e4cafee.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion
Diffstat (limited to 'arch/arm/mach-kirkwood/netxbig_v2-setup.c')
| -rw-r--r-- | arch/arm/mach-kirkwood/netxbig_v2-setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-kirkwood/netxbig_v2-setup.c b/arch/arm/mach-kirkwood/netxbig_v2-setup.c index a1b45d5..93afd3c 100644 --- a/arch/arm/mach-kirkwood/netxbig_v2-setup.c +++ b/arch/arm/mach-kirkwood/netxbig_v2-setup.c @@ -403,7 +403,7 @@ MACHINE_START(NET2BIG_V2, "LaCie 2Big Network v2") .init_machine = netxbig_v2_init, .map_io = kirkwood_map_io, .init_irq = kirkwood_init_irq, - .timer = &lacie_v2_timer, + .timer = &kirkwood_timer, MACHINE_END #endif @@ -413,6 +413,6 @@ MACHINE_START(NET5BIG_V2, "LaCie 5Big Network v2") .init_machine = netxbig_v2_init, .map_io = kirkwood_map_io, .init_irq = kirkwood_init_irq, - .timer = &lacie_v2_timer, + .timer = &kirkwood_timer, MACHINE_END #endif |