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-generic.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-generic.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index bb4af05c7f0a..4431ad364565 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c | |||
| @@ -65,7 +65,7 @@ static void __init omap_generic_map_io(void) | |||
| 65 | /* XXX This machine entry name should be updated */ | 65 | /* XXX This machine entry name should be updated */ |
| 66 | MACHINE_START(OMAP_GENERIC, "Generic OMAP24xx") | 66 | MACHINE_START(OMAP_GENERIC, "Generic OMAP24xx") |
| 67 | /* Maintainer: Paul Mundt <paul.mundt@nokia.com> */ | 67 | /* Maintainer: Paul Mundt <paul.mundt@nokia.com> */ |
| 68 | .boot_params = 0x80000100, | 68 | .atag_offset = 0x100, |
| 69 | .reserve = omap_reserve, | 69 | .reserve = omap_reserve, |
| 70 | .map_io = omap_generic_map_io, | 70 | .map_io = omap_generic_map_io, |
| 71 | .init_early = omap_generic_init_early, | 71 | .init_early = omap_generic_init_early, |