Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra

[pandora-kernel.git] / arch / arm / mach-mxc91231 / magx-zn5.c

diff --git a/arch/arm/mach-mxc91231/magx-zn5.c b/arch/arm/mach-mxc91231/magx-zn5.c
index 395d83b..f31a45e 100644 (file)
--- a/arch/arm/mach-mxc91231/magx-zn5.c
+++ b/arch/arm/mach-mxc91231/magx-zn5.c
@@ -53,9 +53,10 @@ struct sys_timer zn5_timer = {
 };
 
 MACHINE_START(MAGX_ZN5, "Motorola Zn5")
-       .boot_params    = MXC91231_PHYS_OFFSET + 0x100,
-       .map_io         = mxc91231_map_io,
-       .init_irq       = mxc91231_init_irq,
-       .timer          = &zn5_timer,
-       .init_machine   = zn5_init,
+       .boot_params = MXC91231_PHYS_OFFSET + 0x100,
+       .map_io = mxc91231_map_io,
+       .init_early = mxc91231_init_early,
+       .init_irq = mxc91231_init_irq,
+       .timer = &zn5_timer,
+       .init_machine = zn5_init,
 MACHINE_END