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

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

diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c
index b09dfe6d6e8d8d8c191ac85436c40acdf04f2ada..c92fd164b05dc8f9a09947894b76f4ed5ae7255d 100644 (file)
--- a/arch/arm/mach-omap1/board-fsample.c
+++ b/arch/arm/mach-omap1/board-fsample.c
@@ -384,7 +384,7 @@ static void __init omap_fsample_map_io(void)
 
 MACHINE_START(OMAP_FSAMPLE, "OMAP730 F-Sample")
 /* Maintainer: Brian Swetland <swetland@google.com> */
-       .boot_params    = 0x10000100,
+       .atag_offset    = 0x100,
        .map_io         = omap_fsample_map_io,
        .init_early     = omap1_init_early,
        .reserve        = omap_reserve,