summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Hintsala <lauri.hintsala@bluegiga.com>2011-11-21 10:55:55 +0200
committerShawn Guo <shawn.guo@linaro.org>2011-12-02 13:27:22 +0800
commit8d2d2d1d7e96f12d9fe140169fb39ef9fd27b7c1 (patch)
tree952c2333c1bc42e529d58fa7f592604e76ab46df
parent5d348401ed03450395ce674594c1c08c7d85bd8d (diff)
downloadlinux-8d2d2d1d7e96f12d9fe140169fb39ef9fd27b7c1.tar.gz
linux-8d2d2d1d7e96f12d9fe140169fb39ef9fd27b7c1.tar.bz2
linux-8d2d2d1d7e96f12d9fe140169fb39ef9fd27b7c1.zip
ARM: mxs: fix machines' initializers order
Initializers of m28evk and stmp378x_devb fixed to be in order they are called. reference: http://article.gmane.org/gmane.linux.ports.arm.omap/50721 Cc: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Lauri Hintsala <lauri.hintsala@bluegiga.com> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
-rw-r--r--arch/arm/mach-mxs/mach-m28evk.c2
-rw-r--r--arch/arm/mach-mxs/mach-stmp378x_devb.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mxs/mach-m28evk.c b/arch/arm/mach-mxs/mach-m28evk.c
index 3b1681e4f49a..6b00577b7025 100644
--- a/arch/arm/mach-mxs/mach-m28evk.c
+++ b/arch/arm/mach-mxs/mach-m28evk.c
@@ -361,6 +361,6 @@ static struct sys_timer m28evk_timer = {
MACHINE_START(M28EVK, "DENX M28 EVK")
.map_io = mx28_map_io,
.init_irq = mx28_init_irq,
- .init_machine = m28evk_init,
.timer = &m28evk_timer,
+ .init_machine = m28evk_init,
MACHINE_END
diff --git a/arch/arm/mach-mxs/mach-stmp378x_devb.c b/arch/arm/mach-mxs/mach-stmp378x_devb.c
index 177e53123a02..6834dea38c04 100644
--- a/arch/arm/mach-mxs/mach-stmp378x_devb.c
+++ b/arch/arm/mach-mxs/mach-stmp378x_devb.c
@@ -115,6 +115,6 @@ static struct sys_timer stmp378x_dvb_timer = {
MACHINE_START(STMP378X, "STMP378X")
.map_io = mx23_map_io,
.init_irq = mx23_init_irq,
- .init_machine = stmp378x_dvb_init,
.timer = &stmp378x_dvb_timer,
+ .init_machine = stmp378x_dvb_init,
MACHINE_END