diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-29 09:35:27 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-29 09:35:27 -0800 |
| commit | 440f39a4fda5d80f290e32f67bd084b63a41a436 (patch) | |
| tree | 913be35b58a374ad3757e937e5f2b23486bb9dd4 /arch/arm/mach-msm/board-halibut.c | |
| parent | 7734a93bf7553042a339748dad6e4961d94cfa28 (diff) | |
| parent | f8060f5446b1f2782f0a8ca9be2d870ea4198aee (diff) | |
Merge branch 'depends/cleanup' into next/dt
Diffstat (limited to 'arch/arm/mach-msm/board-halibut.c')
| -rw-r--r-- | arch/arm/mach-msm/board-halibut.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/board-halibut.c b/arch/arm/mach-msm/board-halibut.c index 6ce542e2e21..84d720af34a 100644 --- a/arch/arm/mach-msm/board-halibut.c +++ b/arch/arm/mach-msm/board-halibut.c @@ -106,5 +106,5 @@ MACHINE_START(HALIBUT, "Halibut Board (QCT SURF7200A)") .init_irq = halibut_init_irq, .init_machine = halibut_init, .init_late = halibut_init_late, - .timer = &msm7x01_timer, + .init_time = msm7x01_timer_init, MACHINE_END |