summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-am3517crane.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-01-29 09:35:27 -0800
committerOlof Johansson <olof@lixom.net>2013-01-29 09:35:27 -0800
commit440f39a4fda5d80f290e32f67bd084b63a41a436 (patch)
tree913be35b58a374ad3757e937e5f2b23486bb9dd4 /arch/arm/mach-omap2/board-am3517crane.c
parent7734a93bf7553042a339748dad6e4961d94cfa28 (diff)
parentf8060f5446b1f2782f0a8ca9be2d870ea4198aee (diff)
Merge branch 'depends/cleanup' into next/dt
Diffstat (limited to 'arch/arm/mach-omap2/board-am3517crane.c')
-rw-r--r--arch/arm/mach-omap2/board-am3517crane.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-am3517crane.c b/arch/arm/mach-omap2/board-am3517crane.c
index 51b96a1206d..07f0be24a5d 100644
--- a/arch/arm/mach-omap2/board-am3517crane.c
+++ b/arch/arm/mach-omap2/board-am3517crane.c
@@ -92,6 +92,6 @@ MACHINE_START(CRANEBOARD, "AM3517/05 CRANEBOARD")
.handle_irq = omap3_intc_handle_irq,
.init_machine = am3517_crane_init,
.init_late = am35xx_init_late,
- .timer = &omap3_timer,
+ .init_time = omap3_sync32k_timer_init,
.restart = omap3xxx_restart,
MACHINE_END