Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc

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

diff --git a/arch/arm/mach-imx/mach-pcm043.c b/arch/arm/mach-imx/mach-pcm043.c
index a27baa493ced33018c17b7d45917c518b4a0b41c..7366c2ae3ea5ccf0c8b74024b96bb135822752ec 100644 (file)
--- a/arch/arm/mach-imx/mach-pcm043.c
+++ b/arch/arm/mach-imx/mach-pcm043.c
@@ -418,7 +418,7 @@ struct sys_timer pcm043_timer = {
 
 MACHINE_START(PCM043, "Phytec Phycore pcm043")
        /* Maintainer: Pengutronix */
-       .boot_params = MX3x_PHYS_OFFSET + 0x100,
+       .atag_offset = 0x100,
        .map_io = mx35_map_io,
        .init_early = imx35_init_early,
        .init_irq = mx35_init_irq,