Merge branch 'misc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux

[pandora-kernel.git] / arch / arm / mach-mxs / mach-tx28.c

diff --git a/arch/arm/mach-mxs/mach-tx28.c b/arch/arm/mach-mxs/mach-tx28.c
index ce5d563..9a1f0e7 100644 (file)
--- a/arch/arm/mach-mxs/mach-tx28.c
+++ b/arch/arm/mach-mxs/mach-tx28.c
@@ -176,6 +176,6 @@ static struct sys_timer tx28_timer = {
 MACHINE_START(TX28, "Ka-Ro electronics TX28 module")
        .map_io = mx28_map_io,
        .init_irq = mx28_init_irq,
-       .init_machine = tx28_stk5v3_init,
        .timer = &tx28_timer,
+       .init_machine = tx28_stk5v3_init,
 MACHINE_END