diff options
Diffstat (limited to 'arch/arm/mach-mxs/mach-mxs.c')
-rw-r--r-- | arch/arm/mach-mxs/mach-mxs.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c index c66129b5dd18..5fad7cefe8aa 100644 --- a/arch/arm/mach-mxs/mach-mxs.c +++ b/arch/arm/mach-mxs/mach-mxs.c | |||
@@ -163,19 +163,11 @@ static void __init imx23_timer_init(void) | |||
163 | mx23_clocks_init(); | 163 | mx23_clocks_init(); |
164 | } | 164 | } |
165 | 165 | ||
166 | static struct sys_timer imx23_timer = { | ||
167 | .init = imx23_timer_init, | ||
168 | }; | ||
169 | |||
170 | static void __init imx28_timer_init(void) | 166 | static void __init imx28_timer_init(void) |
171 | { | 167 | { |
172 | mx28_clocks_init(); | 168 | mx28_clocks_init(); |
173 | } | 169 | } |
174 | 170 | ||
175 | static struct sys_timer imx28_timer = { | ||
176 | .init = imx28_timer_init, | ||
177 | }; | ||
178 | |||
179 | enum mac_oui { | 171 | enum mac_oui { |
180 | OUI_FSL, | 172 | OUI_FSL, |
181 | OUI_DENX, | 173 | OUI_DENX, |
@@ -446,7 +438,7 @@ DT_MACHINE_START(IMX23, "Freescale i.MX23 (Device Tree)") | |||
446 | .map_io = mx23_map_io, | 438 | .map_io = mx23_map_io, |
447 | .init_irq = icoll_init_irq, | 439 | .init_irq = icoll_init_irq, |
448 | .handle_irq = icoll_handle_irq, | 440 | .handle_irq = icoll_handle_irq, |
449 | .timer = &imx23_timer, | 441 | .init_time = imx23_timer_init, |
450 | .init_machine = mxs_machine_init, | 442 | .init_machine = mxs_machine_init, |
451 | .dt_compat = imx23_dt_compat, | 443 | .dt_compat = imx23_dt_compat, |
452 | .restart = mxs_restart, | 444 | .restart = mxs_restart, |
@@ -456,7 +448,7 @@ DT_MACHINE_START(IMX28, "Freescale i.MX28 (Device Tree)") | |||
456 | .map_io = mx28_map_io, | 448 | .map_io = mx28_map_io, |
457 | .init_irq = icoll_init_irq, | 449 | .init_irq = icoll_init_irq, |
458 | .handle_irq = icoll_handle_irq, | 450 | .handle_irq = icoll_handle_irq, |
459 | .timer = &imx28_timer, | 451 | .init_time = imx28_timer_init, |
460 | .init_machine = mxs_machine_init, | 452 | .init_machine = mxs_machine_init, |
461 | .dt_compat = imx28_dt_compat, | 453 | .dt_compat = imx28_dt_compat, |
462 | .restart = mxs_restart, | 454 | .restart = mxs_restart, |