OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[uclinux-h8/linux.git]
/
arch
/
arm
/
mach-imx
/
mach-imx25.c
diff --git
a/arch/arm/mach-imx/mach-imx25.c
b/arch/arm/mach-imx/mach-imx25.c
index
9379fd0
..
32dcb5e
100644
(file)
--- a/
arch/arm/mach-imx/mach-imx25.c
+++ b/
arch/arm/mach-imx/mach-imx25.c
@@
-41,6
+41,7
@@
static const char * const imx25_dt_board_compat[] __initconst = {
DT_MACHINE_START(IMX25_DT, "Freescale i.MX25 (Device Tree Support)")
.init_early = imx25_init_early,
+ .init_late = imx25_pm_init,
.init_irq = mx25_init_irq,
.dt_compat = imx25_dt_board_compat,
MACHINE_END