diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-11 09:21:44 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-11 09:21:44 -0800 |
| commit | 5f48a29f1721736930b7817b430039c1d348dd05 (patch) | |
| tree | 69c47c1105d275810123785a947227b9aa8028d6 /arch/arm/mach-shmobile/board-kzm9d.c | |
| parent | 3ad06d1a7dfd99a2e8f3a41e0fa5118551186d3c (diff) | |
| parent | f8060f5446b1f2782f0a8ca9be2d870ea4198aee (diff) | |
Merge branch 'depends/cleanup' into next/virt
Diffstat (limited to 'arch/arm/mach-shmobile/board-kzm9d.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-kzm9d.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-kzm9d.c b/arch/arm/mach-shmobile/board-kzm9d.c index f3f180dc23e5..c254782aa727 100644 --- a/arch/arm/mach-shmobile/board-kzm9d.c +++ b/arch/arm/mach-shmobile/board-kzm9d.c @@ -90,6 +90,6 @@ DT_MACHINE_START(KZM9D_DT, "kzm9d") .init_irq = emev2_init_irq, .init_machine = kzm9d_add_standard_devices, .init_late = shmobile_init_late, - .timer = &shmobile_timer, + .init_time = shmobile_timer_init, .dt_compat = kzm9d_boards_compat_dt, MACHINE_END |