diff options
author | Arnd Bergmann | 2013-04-19 23:12:42 +0200 |
---|---|---|
committer | Arnd Bergmann | 2013-04-19 23:12:42 +0200 |
commit | 22cf644e03419b4c3d002109b021c7482306f0bf (patch) | |
tree | db426bcf5d4f7acfdbcaa5276b87d12cbb061fa1 /arch/arm/mach-omap2/board-generic.c | |
parent | Linux 3.9-rc6 (diff) | |
parent | ARM: exynos: restore mach/regs-clock.h for exynos5 (diff) | |
download | kernel-qcow2-linux-22cf644e03419b4c3d002109b021c7482306f0bf.tar.gz kernel-qcow2-linux-22cf644e03419b4c3d002109b021c7482306f0bf.tar.xz kernel-qcow2-linux-22cf644e03419b4c3d002109b021c7482306f0bf.zip |
Merge branch 'next/drivers' into late/multiplatform
Multiple parts of next/drivers are prerequisites for the final
exynos multiplatform changes, so let's pull in the entire branch.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap2/board-generic.c')
-rw-r--r-- | arch/arm/mach-omap2/board-generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index e54a48060198..78813b397209 100644 --- 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 |