summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-ti8168evm.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-05-11 00:49:56 -0700
committerOlof Johansson <olof@lixom.net>2012-05-11 00:49:56 -0700
commit80b9abf973462499c1a0110df47f62cc90361e2c (patch)
tree4e67448ba08df9a68713611b93e9f2635bf8bb26 /arch/arm/mach-omap2/board-ti8168evm.c
parentd48b97b403d23f6df0b990cee652bdf9a52337a3 (diff)
parenta010bc2b9e2ccc0b59057d4cc136d48a1f7cebcb (diff)
downloadop-kernel-dev-80b9abf973462499c1a0110df47f62cc90361e2c.zip
op-kernel-dev-80b9abf973462499c1a0110df47f62cc90361e2c.tar.gz
Merge branch 'clean/late_initcall_v2' of git://git.linaro.org/people/shawnguo/linux-2.6 into staging/cleanup
By Shawn Guo via Shawn Guo * 'clean/late_initcall_v2' of git://git.linaro.org/people/shawnguo/linux-2.6: ARM: ux500: use machine specific hook for late init ARM: tegra: use machine specific hook for late init ARM: shmobile: use machine specific hook for late init ARM: sa1100: use machine specific hook for late init ARM: s3c64xx: use machine specific hook for late init ARM: prima2: use machine specific hook for late init ARM: pnx4008: use machine specific hook for late init ARM: omap2: use machine specific hook for late init ARM: omap1: use machine specific hook for late init ARM: msm: use machine specific hook for late init ARM: imx: use machine specific hook for late init ARM: exynos: use machine specific hook for late init ARM: ep93xx: use machine specific hook for late init ARM: davinci: use machine specific hook for late init ARM: provide a late_initcall hook for platform initialization
Diffstat (limited to 'arch/arm/mach-omap2/board-ti8168evm.c')
-rw-r--r--arch/arm/mach-omap2/board-ti8168evm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-ti8168evm.c b/arch/arm/mach-omap2/board-ti8168evm.c
index ab9a7a9..d4c8392 100644
--- a/arch/arm/mach-omap2/board-ti8168evm.c
+++ b/arch/arm/mach-omap2/board-ti8168evm.c
@@ -52,6 +52,7 @@ MACHINE_START(TI8168EVM, "ti8168evm")
.init_irq = ti81xx_init_irq,
.timer = &omap3_timer,
.init_machine = ti81xx_evm_init,
+ .init_late = ti81xx_init_late,
.restart = omap_prcm_restart,
MACHINE_END
@@ -63,5 +64,6 @@ MACHINE_START(TI8148EVM, "ti8148evm")
.init_irq = ti81xx_init_irq,
.timer = &omap3_timer,
.init_machine = ti81xx_evm_init,
+ .init_late = ti81xx_init_late,
.restart = omap_prcm_restart,
MACHINE_END
OpenPOWER on IntegriCloud