diff options
| author | Jon Hunter <jon-hunter@ti.com> | 2013-04-01 13:47:29 -0500 |
|---|---|---|
| committer | Jon Hunter <jon-hunter@ti.com> | 2013-04-01 13:47:29 -0500 |
| commit | 2d61aecee8f32259920cdf90a452fa26ffc64e9f (patch) | |
| tree | 2311b6b4c12b946164e8cfb3422cebdfecf08f37 /arch/arm/mach-at91/board-1arm.c | |
| parent | 71856843fb1d8ee455a4c1a60696c74afa4809e5 (diff) | |
| parent | 6bb27d7349db51b50c40534710fe164ca0d58902 (diff) | |
| download | olio-linux-3.10-2d61aecee8f32259920cdf90a452fa26ffc64e9f.tar.xz olio-linux-3.10-2d61aecee8f32259920cdf90a452fa26ffc64e9f.zip | |
Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
Diffstat (limited to 'arch/arm/mach-at91/board-1arm.c')
| -rw-r--r-- | arch/arm/mach-at91/board-1arm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-1arm.c b/arch/arm/mach-at91/board-1arm.c index b99b5752cc1..35ab632bbf6 100644 --- a/arch/arm/mach-at91/board-1arm.c +++ b/arch/arm/mach-at91/board-1arm.c @@ -90,7 +90,7 @@ static void __init onearm_board_init(void) MACHINE_START(ONEARM, "Ajeco 1ARM single board computer") /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ - .timer = &at91rm9200_timer, + .init_time = at91rm9200_timer_init, .map_io = at91_map_io, .handle_irq = at91_aic_handle_irq, .init_early = onearm_init_early, |