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

[mirror_ubuntu-zesty-kernel.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 bbd13f454151bcee0bbbd1a732df19693cafedf2..2204911a24e97241fd73d4ba2c3cdf707f429054 100644 (file)
--- a/arch/arm/mach-exynos4/mach-nuri.c
+++ b/arch/arm/mach-exynos4/mach-nuri.c
@@ -1186,7 +1186,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,