Merge branch 'devel-stable' into for-next

[karo-tx-linux.git] / arch / arm / mach-pxa / saarb.c

diff --git a/arch/arm/mach-pxa/saarb.c b/arch/arm/mach-pxa/saarb.c
index 87e9b757ef34d180b97477de5dcd31b7d4a8b7b5..87070a8cda9f7c02d450ec8ef2d6cb9f2e563763 100644 (file)
--- a/arch/arm/mach-pxa/saarb.c
+++ b/arch/arm/mach-pxa/saarb.c
@@ -102,7 +102,7 @@ static void __init saarb_init(void)
 }
 
 MACHINE_START(SAARB, "PXA955 Handheld Platform (aka SAARB)")
-       .boot_params    = 0xa0000100,
+       .atag_offset    = 0x100,
        .map_io         = pxa3xx_map_io,
        .nr_irqs        = SAARB_NR_IRQS,
        .init_irq       = pxa95x_init_irq,