diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-28 08:03:23 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-28 08:03:34 +0100 |
| commit | 66eae035dc59755c51ad3b3c718a5ed7535322e3 (patch) | |
| tree | a30f914378e8c72c2885d2d53551d6e3fbf4bd6d /arch/arm/mach-ixp4xx/dsmg600-setup.c | |
| parent | Merge branch 'vt8500/wm8x50' into next/soc (diff) | |
| parent | Merge tag 'gic-vic-to-irqchip' of git://sources.calxeda.com/kernel/linux into... (diff) | |
| download | linux-66eae035dc59755c51ad3b3c718a5ed7535322e3.tar.xz linux-66eae035dc59755c51ad3b3c718a5ed7535322e3.zip | |
Merge branch 'depends/cleanup' into next/soc
Signed-off-by: Olof Johansson <olof@lixom.net>
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) ixp4xx_timer_init(); } -static struct sys_timer dsmg600_timer = { - .init = dsmg600_timer_init, -}; - static void __init dsmg600_init(void) { ixp4xx_sys_init(); @@ -282,7 +278,7 @@ MACHINE_START(DSMG600, "D-Link DSM-G600 RevA") .map_io = ixp4xx_map_io, .init_early = ixp4xx_init_early, .init_irq = ixp4xx_init_irq, - .timer = &dsmg600_timer, + .init_time = dsmg600_timer_init, .init_machine = dsmg600_init, #if defined(CONFIG_PCI) .dma_zone_size = SZ_64M, |