Merge branch 'depends/rmk/devel-stable' into next/cleanup
[linux-3.10.git] / arch / arm / mach-u300 / u300.c
index 25d11ba..89422ee 100644 (file)
@@ -46,7 +46,7 @@ static void __init u300_init_machine(void)
 
 MACHINE_START(U300, MACH_U300_STRING)
        /* Maintainer: Linus Walleij <linus.walleij@stericsson.com> */
-       .boot_params    = BOOT_PARAMS_OFFSET,
+       .atag_offset    = BOOT_PARAMS_OFFSET,
        .map_io         = u300_map_io,
        .init_irq       = u300_init_irq,
        .timer          = &u300_timer,