Merge branch 'depends/rmk/memory_h' into next/fixes

[linux.git] / arch / arm / mach-imx / mach-cpuimx35.c

diff --git a/arch/arm/mach-imx/mach-cpuimx35.c b/arch/arm/mach-imx/mach-cpuimx35.c
index f39a478ba1a63540a26783a4713033b37121d4f3..470b654b0e6eef12cba24b29d34faf112e3fa5c9 100644 (file)
--- a/arch/arm/mach-imx/mach-cpuimx35.c
+++ b/arch/arm/mach-imx/mach-cpuimx35.c
@@ -192,9 +192,9 @@ struct sys_timer eukrea_cpuimx35_timer = {
        .init   = eukrea_cpuimx35_timer_init,
 };
 
        .init   = eukrea_cpuimx35_timer_init,
 };
 

-MACHINE_START(EUKREA_CPUIMX35, "Eukrea CPUIMX35")
+MACHINE_START(EUKREA_CPUIMX35SD, "Eukrea CPUIMX35")

        /* Maintainer: Eukrea Electromatique */
        /* Maintainer: Eukrea Electromatique */

-       .boot_params = MX3x_PHYS_OFFSET + 0x100,
+       .atag_offset = 0x100,

        .map_io = mx35_map_io,
        .init_early = imx35_init_early,
        .init_irq = mx35_init_irq,
        .map_io = mx35_map_io,
        .init_early = imx35_init_early,
        .init_irq = mx35_init_irq,