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-davinci/board-mityomapl138.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-davinci/board-mityomapl138.c')
-rw-r--r-- | arch/arm/mach-davinci/board-mityomapl138.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c index c278226627ad..6efc84cceca0 100644 --- a/arch/arm/mach-davinci/board-mityomapl138.c +++ b/arch/arm/mach-davinci/board-mityomapl138.c | |||
@@ -566,7 +566,7 @@ static void __init mityomapl138_map_io(void) | |||
566 | } | 566 | } |
567 | 567 | ||
568 | MACHINE_START(MITYOMAPL138, "MityDSP-L138/MityARM-1808") | 568 | MACHINE_START(MITYOMAPL138, "MityDSP-L138/MityARM-1808") |
569 | .boot_params = (DA8XX_DDR_BASE + 0x100), | 569 | .atag_offset = 0x100, |
570 | .map_io = mityomapl138_map_io, | 570 | .map_io = mityomapl138_map_io, |
571 | .init_irq = cp_intc_init, | 571 | .init_irq = cp_intc_init, |
572 | .timer = &davinci_timer, | 572 | .timer = &davinci_timer, |