diff options
Diffstat (limited to 'arch/arm/mach-ixp4xx/dsmg600-setup.c')
-rw-r--r-- | arch/arm/mach-ixp4xx/dsmg600-setup.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-ixp4xx/dsmg600-setup.c b/arch/arm/mach-ixp4xx/dsmg600-setup.c index 97a0af8f1955..5d413f8c5700 100644 --- a/arch/arm/mach-ixp4xx/dsmg600-setup.c +++ b/arch/arm/mach-ixp4xx/dsmg600-setup.c | |||
@@ -226,10 +226,6 @@ static void __init dsmg600_timer_init(void) | |||
226 | ixp4xx_timer_init(); | 226 | ixp4xx_timer_init(); |
227 | } | 227 | } |
228 | 228 | ||
229 | static struct sys_timer dsmg600_timer = { | ||
230 | .init = dsmg600_timer_init, | ||
231 | }; | ||
232 | |||
233 | static void __init dsmg600_init(void) | 229 | static void __init dsmg600_init(void) |
234 | { | 230 | { |
235 | ixp4xx_sys_init(); | 231 | ixp4xx_sys_init(); |
@@ -282,7 +278,7 @@ MACHINE_START(DSMG600, "D-Link DSM-G600 RevA") | |||
282 | .map_io = ixp4xx_map_io, | 278 | .map_io = ixp4xx_map_io, |
283 | .init_early = ixp4xx_init_early, | 279 | .init_early = ixp4xx_init_early, |
284 | .init_irq = ixp4xx_init_irq, | 280 | .init_irq = ixp4xx_init_irq, |
285 | .timer = &dsmg600_timer, | 281 | .init_time = dsmg600_timer_init, |
286 | .init_machine = dsmg600_init, | 282 | .init_machine = dsmg600_init, |
287 | #if defined(CONFIG_PCI) | 283 | #if defined(CONFIG_PCI) |
288 | .dma_zone_size = SZ_64M, | 284 | .dma_zone_size = SZ_64M, |