diff options
| author | Stephen Warren <swarren@wwwdotorg.org> | 2013-01-15 05:44:27 +0100 |
|---|---|---|
| committer | Stephen Warren <swarren@wwwdotorg.org> | 2013-01-15 05:44:27 +0100 |
| commit | b2fc382aad0a8f52803acdc3ac4e5540dbcdf1f6 (patch) | |
| tree | ed79658afd978b1e52ace0fb58d1628b79c0f78b /arch/arm/mach-shmobile/board-kzm9d.c | |
| parent | Linux 3.8-rc3 (diff) | |
| parent | ARM: at91: fix board-rm9200-dt after sys_timer conversion (diff) | |
| download | linux-b2fc382aad0a8f52803acdc3ac4e5540dbcdf1f6.tar.xz linux-b2fc382aad0a8f52803acdc3ac4e5540dbcdf1f6.zip | |
Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into cleanup
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 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 |