aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/board-neocore926.c
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2012-11-08 14:40:59 -0500
committerStephen Warren <swarren@nvidia.com>2012-12-24 11:36:38 -0500
commit6bb27d7349db51b50c40534710fe164ca0d58902 (patch)
tree8f227c8bbf27b87275302dc133bb2b949b64622f /arch/arm/mach-at91/board-neocore926.c
parent7704c095230e2e9863f3aacd0489a4b4cc00bf45 (diff)
ARM: delete struct sys_timer
Now that the only field in struct sys_timer is .init, delete the struct, and replace the machine descriptor .timer field with the initialization function itself. This will enable moving timer drivers into drivers/clocksource without having to place a public prototype of each struct sys_timer object into include/linux; the intent is to create a single of_clocksource_init() function that determines which timer driver to initialize by scanning the device dtree, much like the proposed irqchip_init() at: http://www.spinics.net/lists/arm-kernel/msg203686.html Includes mach-omap2 fixes from Igor Grinberg. Tested-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch/arm/mach-at91/board-neocore926.c')
-rw-r--r--arch/arm/mach-at91/board-neocore926.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-neocore926.c b/arch/arm/mach-at91/board-neocore926.c
index bc7a1c4a1f6a..5b4760fe53de 100644
--- a/arch/arm/mach-at91/board-neocore926.c
+++ b/arch/arm/mach-at91/board-neocore926.c
@@ -378,7 +378,7 @@ static void __init neocore926_board_init(void)
378 378
379MACHINE_START(NEOCORE926, "ADENEO NEOCORE 926") 379MACHINE_START(NEOCORE926, "ADENEO NEOCORE 926")
380 /* Maintainer: ADENEO */ 380 /* Maintainer: ADENEO */
381 .timer = &at91sam926x_timer, 381 .init_time = at91sam926x_pit_init,
382 .map_io = at91_map_io, 382 .map_io = at91_map_io,
383 .handle_irq = at91_aic_handle_irq, 383 .handle_irq = at91_aic_handle_irq,
384 .init_early = neocore926_init_early, 384 .init_early = neocore926_init_early,