diff options
Diffstat (limited to 'arch/arm/mach-imx/mach-armadillo5x0.c')
-rw-r--r-- | arch/arm/mach-imx/mach-armadillo5x0.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-imx/mach-armadillo5x0.c b/arch/arm/mach-imx/mach-armadillo5x0.c index 59bd6b06a6b5..368a6e3f5926 100644 --- a/arch/arm/mach-imx/mach-armadillo5x0.c +++ b/arch/arm/mach-imx/mach-armadillo5x0.c | |||
@@ -557,10 +557,6 @@ static void __init armadillo5x0_timer_init(void) | |||
557 | mx31_clocks_init(26000000); | 557 | mx31_clocks_init(26000000); |
558 | } | 558 | } |
559 | 559 | ||
560 | static struct sys_timer armadillo5x0_timer = { | ||
561 | .init = armadillo5x0_timer_init, | ||
562 | }; | ||
563 | |||
564 | MACHINE_START(ARMADILLO5X0, "Armadillo-500") | 560 | MACHINE_START(ARMADILLO5X0, "Armadillo-500") |
565 | /* Maintainer: Alberto Panizzo */ | 561 | /* Maintainer: Alberto Panizzo */ |
566 | .atag_offset = 0x100, | 562 | .atag_offset = 0x100, |
@@ -568,7 +564,7 @@ MACHINE_START(ARMADILLO5X0, "Armadillo-500") | |||
568 | .init_early = imx31_init_early, | 564 | .init_early = imx31_init_early, |
569 | .init_irq = mx31_init_irq, | 565 | .init_irq = mx31_init_irq, |
570 | .handle_irq = imx31_handle_irq, | 566 | .handle_irq = imx31_handle_irq, |
571 | .timer = &armadillo5x0_timer, | 567 | .init_time = armadillo5x0_timer_init, |
572 | .init_machine = armadillo5x0_init, | 568 | .init_machine = armadillo5x0_init, |
573 | .restart = mxc_restart, | 569 | .restart = mxc_restart, |
574 | MACHINE_END | 570 | MACHINE_END |