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-omap1/board-palmte.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-omap1/board-palmte.c')
-rw-r--r-- | arch/arm/mach-omap1/board-palmte.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c index a60e6c22f816..949b62a73693 100644 --- a/arch/arm/mach-omap1/board-palmte.c +++ b/arch/arm/mach-omap1/board-palmte.c | |||
@@ -267,6 +267,7 @@ MACHINE_START(OMAP_PALMTE, "OMAP310 based Palm Tungsten E") | |||
267 | .reserve = omap_reserve, | 267 | .reserve = omap_reserve, |
268 | .init_irq = omap1_init_irq, | 268 | .init_irq = omap1_init_irq, |
269 | .init_machine = omap_palmte_init, | 269 | .init_machine = omap_palmte_init, |
270 | .init_late = omap1_init_late, | ||
270 | .timer = &omap1_timer, | 271 | .timer = &omap1_timer, |
271 | .restart = omap1_restart, | 272 | .restart = omap1_restart, |
272 | MACHINE_END | 273 | MACHINE_END |