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

[linux-beck.git] / arch / arm / mach-omap2 / board-rm680.c

diff --git a/arch/arm/mach-omap2/board-rm680.c b/arch/arm/mach-omap2/board-rm680.c
index a98db616e0d4d717c8c515f3d62e8b4d2fabce6c..616fb39763b0f4b82d9885a7057a0c0a6bdc6cde 100644 (file)
--- a/arch/arm/mach-omap2/board-rm680.c
+++ b/arch/arm/mach-omap2/board-rm680.c
@@ -144,7 +144,7 @@ static void __init rm680_init(void)
 }
 
 MACHINE_START(NOKIA_RM680, "Nokia RM-680 board")
-       .boot_params    = 0x80000100,
+       .atag_offset    = 0x100,
        .reserve        = omap_reserve,
        .map_io         = omap3_map_io,
        .init_early     = omap3630_init_early,