diff options
| author | Stephen Warren <swarren@nvidia.com> | 2013-01-28 10:20:34 -0700 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2013-01-28 10:20:34 -0700 |
| commit | f3dab3989b4282e448cba0f0708934276dcb413a (patch) | |
| tree | ed79658afd978b1e52ace0fb58d1628b79c0f78b /arch/arm/mach-msm/board-msm7x30.c | |
| parent | 9931faca02c604c22335f5a935a501bb2ace6e20 (diff) | |
| parent | 90cf214d6a549bf482e3c5751ee256cc885b96ea (diff) | |
| download | olio-linux-3.10-f3dab3989b4282e448cba0f0708934276dcb413a.tar.xz olio-linux-3.10-f3dab3989b4282e448cba0f0708934276dcb413a.zip | |
Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into for-3.9/cleanup
Diffstat (limited to 'arch/arm/mach-msm/board-msm7x30.c')
| -rw-r--r-- | arch/arm/mach-msm/board-msm7x30.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-msm/board-msm7x30.c b/arch/arm/mach-msm/board-msm7x30.c index effa6f4336c..7bc3f82e3ec 100644 --- a/arch/arm/mach-msm/board-msm7x30.c +++ b/arch/arm/mach-msm/board-msm7x30.c @@ -131,7 +131,7 @@ MACHINE_START(MSM7X30_SURF, "QCT MSM7X30 SURF") .init_irq = msm7x30_init_irq, .init_machine = msm7x30_init, .init_late = msm7x30_init_late, - .timer = &msm7x30_timer, + .init_time = msm7x30_timer_init, MACHINE_END MACHINE_START(MSM7X30_FFA, "QCT MSM7X30 FFA") @@ -142,7 +142,7 @@ MACHINE_START(MSM7X30_FFA, "QCT MSM7X30 FFA") .init_irq = msm7x30_init_irq, .init_machine = msm7x30_init, .init_late = msm7x30_init_late, - .timer = &msm7x30_timer, + .init_time = msm7x30_timer_init, MACHINE_END MACHINE_START(MSM7X30_FLUID, "QCT MSM7X30 FLUID") @@ -153,5 +153,5 @@ MACHINE_START(MSM7X30_FLUID, "QCT MSM7X30 FLUID") .init_irq = msm7x30_init_irq, .init_machine = msm7x30_init, .init_late = msm7x30_init_late, - .timer = &msm7x30_timer, + .init_time = msm7x30_timer_init, MACHINE_END |