diff options
author | Olof Johansson <olof@lixom.net> | 2012-05-11 03:49:56 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-05-11 03:49:56 -0400 |
commit | 80b9abf973462499c1a0110df47f62cc90361e2c (patch) | |
tree | 4e67448ba08df9a68713611b93e9f2635bf8bb26 /arch/arm/mach-omap2/board-cm-t35.c | |
parent | d48b97b403d23f6df0b990cee652bdf9a52337a3 (diff) | |
parent | a010bc2b9e2ccc0b59057d4cc136d48a1f7cebcb (diff) |
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-cm-t35.c')
-rw-r--r-- | arch/arm/mach-omap2/board-cm-t35.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c index 909a8b91b564..f9750613686c 100644 --- a/arch/arm/mach-omap2/board-cm-t35.c +++ b/arch/arm/mach-omap2/board-cm-t35.c | |||
@@ -686,6 +686,7 @@ MACHINE_START(CM_T35, "Compulab CM-T35") | |||
686 | .init_irq = omap3_init_irq, | 686 | .init_irq = omap3_init_irq, |
687 | .handle_irq = omap3_intc_handle_irq, | 687 | .handle_irq = omap3_intc_handle_irq, |
688 | .init_machine = cm_t35_init, | 688 | .init_machine = cm_t35_init, |
689 | .init_late = omap35xx_init_late, | ||
689 | .timer = &omap3_timer, | 690 | .timer = &omap3_timer, |
690 | .restart = omap_prcm_restart, | 691 | .restart = omap_prcm_restart, |
691 | MACHINE_END | 692 | MACHINE_END |
@@ -698,6 +699,7 @@ MACHINE_START(CM_T3730, "Compulab CM-T3730") | |||
698 | .init_irq = omap3_init_irq, | 699 | .init_irq = omap3_init_irq, |
699 | .handle_irq = omap3_intc_handle_irq, | 700 | .handle_irq = omap3_intc_handle_irq, |
700 | .init_machine = cm_t3730_init, | 701 | .init_machine = cm_t3730_init, |
702 | .init_late = omap3630_init_late, | ||
701 | .timer = &omap3_timer, | 703 | .timer = &omap3_timer, |
702 | .restart = omap_prcm_restart, | 704 | .restart = omap_prcm_restart, |
703 | MACHINE_END | 705 | MACHINE_END |