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

[karo-tx-linux.git] / arch / arm / mach-omap1 / board-osk.c

diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index 562986e1874ff39b3ab94ef3834062d14b3fa870..3e12a697fa21c29284c1faf96e492913e20cd516 100644 (file)
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -572,7 +572,7 @@ static void __init osk_init(void)
 
 MACHINE_START(OMAP_OSK, "TI-OSK")
        /* Maintainer: Dirk Behme <dirk.behme@de.bosch.com> */
-       .boot_params    = 0x10000100,
+       .atag_offset    = 0x100,
        .map_io         = omap16xx_map_io,
        .init_early     = omap1_init_early,
        .reserve        = omap_reserve,