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

[linux.git] / arch / arm / mach-exynos4 / mach-nuri.c

diff --git a/arch/arm/mach-exynos4/mach-nuri.c b/arch/arm/mach-exynos4/mach-nuri.c
index 816a502e91530f368abe49b7cf7c3d7e88699fb8..236bbe187163257665e70ea02c1be15d7814d53d 100644 (file)
--- a/arch/arm/mach-exynos4/mach-nuri.c
+++ b/arch/arm/mach-exynos4/mach-nuri.c
@@ -1330,7 +1330,7 @@ static void __init nuri_machine_init(void)
 
 MACHINE_START(NURI, "NURI")
        /* Maintainer: Kyungmin Park <kyungmin.park@samsung.com> */
-       .boot_params    = S5P_PA_SDRAM + 0x100,
+       .atag_offset    = 0x100,
        .init_irq       = exynos4_init_irq,
        .map_io         = nuri_map_io,
        .init_machine   = nuri_machine_init,