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-omap1/board-osk.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-omap1/board-osk.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-osk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c index bf1ebe5b2442..e4dca1deebb4 100644 --- a/arch/arm/mach-omap1/board-osk.c +++ b/arch/arm/mach-omap1/board-osk.c | |||
| @@ -582,7 +582,7 @@ static void __init osk_map_io(void) | |||
| 582 | 582 | ||
| 583 | MACHINE_START(OMAP_OSK, "TI-OSK") | 583 | MACHINE_START(OMAP_OSK, "TI-OSK") |
| 584 | /* Maintainer: Dirk Behme <dirk.behme@de.bosch.com> */ | 584 | /* Maintainer: Dirk Behme <dirk.behme@de.bosch.com> */ |
| 585 | .boot_params = 0x10000100, | 585 | .atag_offset = 0x100, |
| 586 | .map_io = osk_map_io, | 586 | .map_io = osk_map_io, |
| 587 | .reserve = omap_reserve, | 587 | .reserve = omap_reserve, |
| 588 | .init_irq = osk_init_irq, | 588 | .init_irq = osk_init_irq, |