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>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/arm/mach-mmp/aspenite.c b/arch/arm/mach-mmp/aspenite.c
index e5dba9c5dc54..9f64d5632e07 100644
--- a/arch/arm/mach-mmp/aspenite.c
+++ b/arch/arm/mach-mmp/aspenite.c
@@ -262,7 +262,7 @@ MACHINE_START(ASPENITE, "PXA168-based Aspenite Development Platform")
         .map_io         = mmp_map_io,
         .nr_irqs        = MMP_NR_IRQS,
         .init_irq       = pxa168_init_irq,
-        .timer          = &pxa168_timer,
+        .init_time      = pxa168_timer_init,
         .init_machine   = common_init,
         .restart        = pxa168_restart,
 MACHINE_END
@@ -271,7 +271,7 @@ MACHINE_START(ZYLONITE2, "PXA168-based Zylonite2 Development Platform")
         .map_io         = mmp_map_io,
         .nr_irqs        = MMP_NR_IRQS,
         .init_irq       = pxa168_init_irq,
-        .timer          = &pxa168_timer,
+        .init_time      = pxa168_timer_init,
         .init_machine   = common_init,
         .restart        = pxa168_restart,
 MACHINE_END