Merge branch 'for-3.3' of git://linux-nfs.org/~bfields/linux

[~andy/linux] / arch / arm / mach-u300 / u300.c

diff --git a/arch/arm/mach-u300/u300.c b/arch/arm/mach-u300/u300.c
index def45bda29327eb14eb97cd3712957814b0f9870..f30c69d91d994d8c432d5993fa6bafa45d7e91f4 100644 (file)
--- a/arch/arm/mach-u300/u300.c
+++ b/arch/arm/mach-u300/u300.c
@@ -47,7 +47,7 @@ static void __init u300_init_machine(void)
 
 MACHINE_START(U300, MACH_U300_STRING)
        /* Maintainer: Linus Walleij <linus.walleij@stericsson.com> */
-       .atag_offset    = BOOT_PARAMS_OFFSET,
+       .atag_offset    = 0x100,
        .map_io         = u300_map_io,
        .init_irq       = u300_init_irq,
        .handle_irq     = vic_handle_irq,