Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-imx / mach-mx1ads.c

diff --git a/arch/arm/mach-imx/mach-mx1ads.c b/arch/arm/mach-imx/mach-mx1ads.c
index 1f446e5eb6367f135d618332883ff94b7796d907..47cf56ac6d5b36d7604c981dd50c3b7766d81431 100644 (file)
--- a/arch/arm/mach-imx/mach-mx1ads.c
+++ b/arch/arm/mach-imx/mach-mx1ads.c
@@ -144,17 +144,19 @@ struct sys_timer mx1ads_timer = {
 
 MACHINE_START(MX1ADS, "Freescale MX1ADS")
        /* Maintainer: Sascha Hauer, Pengutronix */
-       .boot_params    = MX1_PHYS_OFFSET + 0x100,
-       .map_io         = mx1_map_io,
-       .init_irq       = mx1_init_irq,
-       .timer          = &mx1ads_timer,
-       .init_machine   = mx1ads_init,
+       .boot_params = MX1_PHYS_OFFSET + 0x100,
+       .map_io = mx1_map_io,
+       .init_early = imx1_init_early,
+       .init_irq = mx1_init_irq,
+       .timer = &mx1ads_timer,
+       .init_machine = mx1ads_init,
 MACHINE_END
 
 MACHINE_START(MXLADS, "Freescale MXLADS")
-       .boot_params    = MX1_PHYS_OFFSET + 0x100,
-       .map_io         = mx1_map_io,
-       .init_irq       = mx1_init_irq,
-       .timer          = &mx1ads_timer,
-       .init_machine   = mx1ads_init,
+       .boot_params = MX1_PHYS_OFFSET + 0x100,
+       .map_io = mx1_map_io,
+       .init_early = imx1_init_early,
+       .init_irq = mx1_init_irq,
+       .timer = &mx1ads_timer,
+       .init_machine = mx1ads_init,
 MACHINE_END