summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/board-kzm9d.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-02-28 18:54:15 +0100
committerArnd Bergmann <arnd@arndb.de>2013-02-28 18:54:15 +0100
commit7266d48fca8ee2a15d15222c41f887e10db54c5a (patch)
tree775404bcbf8ce146ccaba905e841a3621ae7ce80 /arch/arm/mach-shmobile/board-kzm9d.c
parentMerge 'mmc/upstream' into late/mvebu2 (diff)
parentARM: at91: fix board-rm9200-dt after sys_timer conversion (diff)
downloadlinux-7266d48fca8ee2a15d15222c41f887e10db54c5a.tar.xz
linux-7266d48fca8ee2a15d15222c41f887e10db54c5a.zip
Merge branch 'timer/cleanup' into late/mvebu2
Basing the mvebu patches on top of the timer cleanup avoids some nasty merges. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-shmobile/board-kzm9d.c')
-rw-r--r--arch/arm/mach-shmobile/board-kzm9d.c2
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 b52bc0d1273f..59be864f5992 100644
--- a/arch/arm/mach-shmobile/board-kzm9d.c
+++ b/arch/arm/mach-shmobile/board-kzm9d.c
@@ -92,6 +92,6 @@ DT_MACHINE_START(KZM9D_DT, "kzm9d")
.handle_irq = gic_handle_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