diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:11:46 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:11:53 -0400 |
| commit | 5839fec9d8db35b2b07359b18a77295418e239ad (patch) | |
| tree | f060f613c7d76b2784a93c96b7b8cd3f0d201254 /arch/arm/mach-omap2/board-ldp.c | |
| parent | 43872fa788060eef91ae437957e0a5e39f1c56fd (diff) | |
| parent | 0cdc8b921d68817b687755b4f6ae20cd8ff1d026 (diff) | |
Merge branch 'depends/rmk/memory_h' into next/fixes
Fix up all conflicts between the memory.h cleanup and bug fixes.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap2/board-ldp.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-ldp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index ddff45c1688c..abe8c7e496a2 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c | |||
| @@ -332,7 +332,7 @@ static void __init omap_ldp_init(void) | |||
| 332 | } | 332 | } |
| 333 | 333 | ||
| 334 | MACHINE_START(OMAP_LDP, "OMAP LDP board") | 334 | MACHINE_START(OMAP_LDP, "OMAP LDP board") |
| 335 | .boot_params = 0x80000100, | 335 | .atag_offset = 0x100, |
| 336 | .reserve = omap_reserve, | 336 | .reserve = omap_reserve, |
| 337 | .map_io = omap3_map_io, | 337 | .map_io = omap3_map_io, |
| 338 | .init_early = omap_ldp_init_early, | 338 | .init_early = omap_ldp_init_early, |