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

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-omap1 / board-htcherald.c

diff --git a/arch/arm/mach-omap1/board-htcherald.c b/arch/arm/mach-omap1/board-htcherald.c
index 67798dfc4f8da6dbd2d9b8a077faa731a8e19f04..e8eedd77fa67f3476bc323a90f4349b73bb8cfa5 100644 (file)
--- a/arch/arm/mach-omap1/board-htcherald.c
+++ b/arch/arm/mach-omap1/board-htcherald.c
@@ -604,7 +604,7 @@ static void __init htcherald_init(void)
 MACHINE_START(HERALD, "HTC Herald")
        /* Maintainer: Cory Maccarrone <darkstar6262@gmail.com> */
        /* Maintainer: wing-linux.sourceforge.net */
-       .boot_params    = 0x10000100,
+       .atag_offset    = 0x100,
        .map_io         = htcherald_map_io,
        .init_early     = omap1_init_early,
        .reserve        = omap_reserve,