diff options
author | Jon Hunter <jon-hunter@ti.com> | 2013-04-01 18:47:29 (GMT) |
---|---|---|
committer | Jon Hunter <jon-hunter@ti.com> | 2013-04-01 18:47:29 (GMT) |
commit | 2d61aecee8f32259920cdf90a452fa26ffc64e9f (patch) | |
tree | 2311b6b4c12b946164e8cfb3422cebdfecf08f37 /arch/arm/mach-msm/board-mahimahi.c | |
parent | 71856843fb1d8ee455a4c1a60696c74afa4809e5 (diff) | |
parent | 6bb27d7349db51b50c40534710fe164ca0d58902 (diff) | |
download | linux-fsl-qoriq-2d61aecee8f32259920cdf90a452fa26ffc64e9f.tar.xz |
Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
Diffstat (limited to 'arch/arm/mach-msm/board-mahimahi.c')
-rw-r--r-- | arch/arm/mach-msm/board-mahimahi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-msm/board-mahimahi.c b/arch/arm/mach-msm/board-mahimahi.c index df00bc0..30c3496 100644 --- a/arch/arm/mach-msm/board-mahimahi.c +++ b/arch/arm/mach-msm/board-mahimahi.c @@ -75,7 +75,7 @@ static void __init mahimahi_init_late(void) smd_debugfs_init(); } -extern struct sys_timer msm_timer; +void msm_timer_init(void); MACHINE_START(MAHIMAHI, "mahimahi") .atag_offset = 0x100, @@ -84,5 +84,5 @@ MACHINE_START(MAHIMAHI, "mahimahi") .init_irq = msm_init_irq, .init_machine = mahimahi_init, .init_late = mahimahi_init_late, - .timer = &msm_timer, + .init_time = msm_timer_init, MACHINE_END |