Merge branch 'omap-timer-for-v3.10' of git://github.com/jonhunter/linux into omap...

[platform/adaptation/renesas_rcar/renesas_kernel.git] / arch / arm / mach-omap2 / board-generic.c

diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index e54a480..78813b3 100644 (file)
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -140,7 +140,7 @@ DT_MACHINE_START(AM33XX_DT, "Generic AM33XX (Flattened Device Tree)")
        .init_irq       = omap_intc_of_init,
        .handle_irq     = omap3_intc_handle_irq,
        .init_machine   = omap_generic_init,
-       .init_time      = omap3_am33xx_gptimer_timer_init,
+       .init_time      = omap3_gptimer_timer_init,
        .dt_compat      = am33xx_boards_compat,
        .restart        = am33xx_restart,
 MACHINE_END