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

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-pxa / z2.c

diff --git a/arch/arm/mach-pxa/z2.c b/arch/arm/mach-pxa/z2.c
index a82d4207f23586f45e43a68c9264b81092046807..ead32c90fec17380cce3dcda522e35812d631eb1 100644 (file)
--- a/arch/arm/mach-pxa/z2.c
+++ b/arch/arm/mach-pxa/z2.c
@@ -719,7 +719,7 @@ static void __init z2_init(void)
 }
 
 MACHINE_START(ZIPIT2, "Zipit Z2")
-       .boot_params    = 0xa0000100,
+       .atag_offset    = 0x100,
        .map_io         = pxa27x_map_io,
        .init_irq       = pxa27x_init_irq,
        .handle_irq     = pxa27x_handle_irq,