diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-28 13:36:23 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-28 13:36:23 -0800 |
| commit | 7bcdd8d5e31db4f49ae52580e86723c376ee0999 (patch) | |
| tree | bd252895046e9e17d3ab74b6a4d592b74976ca99 /arch/arm/mach-ks8695/board-sg.c | |
| parent | 96e61b8e34ea4982ce57319c19ab73e9e5d74165 (diff) | |
| parent | f8060f5446b1f2782f0a8ca9be2d870ea4198aee (diff) | |
| download | op-kernel-dev-7bcdd8d5e31db4f49ae52580e86723c376ee0999.zip op-kernel-dev-7bcdd8d5e31db4f49ae52580e86723c376ee0999.tar.gz | |
Merge branch 'depends/cleanup' into next/drivers
* depends/cleanup: (375 commits)
ARM: at91: fix board-rm9200-dt after sys_timer conversion
clocksource: use clockevents_config_and_register() where possible
ARM: use clockevents_config_and_register() where possible
clockevents: export clockevents_config_and_register for module use
timer: vt8500: Move timer code to drivers/clocksource
irqchip: Move ARM vic.h to include/linux/irqchip/arm-vic.h
ARM: picoxcell: use common irqchip_init function
ARM: spear: use common irqchip_init function
irqchip: Move ARM VIC to drivers/irqchip
ARM: samsung: remove unused tick.h
ARM: remove unneeded vic.h includes
ARM: remove mach .handle_irq for VIC users
ARM: VIC: set handle_arch_irq in VIC initialization
ARM: VIC: shrink down vic.h
irqchip: Move ARM gic.h to include/linux/irqchip/arm-gic.h
ARM: use common irqchip_init for GIC init
irqchip: Move ARM GIC to drivers/irqchip
ARM: remove mach .handle_irq for GIC users
ARM: GIC: set handle_arch_irq in GIC initialization
ARM: GIC: remove direct use of gic_raise_softirq
...
Diffstat (limited to 'arch/arm/mach-ks8695/board-sg.c')
| -rw-r--r-- | arch/arm/mach-ks8695/board-sg.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-ks8695/board-sg.c b/arch/arm/mach-ks8695/board-sg.c index f35b98b..fdf2352 100644 --- a/arch/arm/mach-ks8695/board-sg.c +++ b/arch/arm/mach-ks8695/board-sg.c @@ -91,7 +91,7 @@ MACHINE_START(LITE300, "SecureComputing/SG300") .map_io = ks8695_map_io, .init_irq = ks8695_init_irq, .init_machine = sg_init, - .timer = &ks8695_timer, + .init_time = ks8695_timer_init, .restart = ks8695_restart, MACHINE_END #endif @@ -103,7 +103,7 @@ MACHINE_START(SG310, "McAfee/SG310") .map_io = ks8695_map_io, .init_irq = ks8695_init_irq, .init_machine = sg_init, - .timer = &ks8695_timer, + .init_time = ks8695_timer_init, .restart = ks8695_restart, MACHINE_END #endif @@ -115,7 +115,7 @@ MACHINE_START(SE4200, "SecureComputing/SE4200") .map_io = ks8695_map_io, .init_irq = ks8695_init_irq, .init_machine = sg_init, - .timer = &ks8695_timer, + .init_time = ks8695_timer_init, .restart = ks8695_restart, MACHINE_END #endif |
