diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:11:46 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 19:25:01 -0400 |
| commit | 5725aeae5ff2e39f3815bbef788ee326c9afea2c (patch) | |
| tree | 4f32f936ba18384d48ab1e537b787a8ce666263f /arch/arm/mach-omap2/board-rx51.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-rx51.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-rx51.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c index 5ea142f9bc97..a6c473bbb3d6 100644 --- a/arch/arm/mach-omap2/board-rx51.c +++ b/arch/arm/mach-omap2/board-rx51.c | |||
| @@ -156,7 +156,7 @@ static void __init rx51_reserve(void) | |||
| 156 | 156 | ||
| 157 | MACHINE_START(NOKIA_RX51, "Nokia RX-51 board") | 157 | MACHINE_START(NOKIA_RX51, "Nokia RX-51 board") |
| 158 | /* Maintainer: Lauri Leukkunen <lauri.leukkunen@nokia.com> */ | 158 | /* Maintainer: Lauri Leukkunen <lauri.leukkunen@nokia.com> */ |
| 159 | .boot_params = 0x80000100, | 159 | .atag_offset = 0x100, |
| 160 | .reserve = rx51_reserve, | 160 | .reserve = rx51_reserve, |
| 161 | .map_io = rx51_map_io, | 161 | .map_io = rx51_map_io, |
| 162 | .init_early = rx51_init_early, | 162 | .init_early = rx51_init_early, |