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-dove/dove-db-setup.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-dove/dove-db-setup.c')
| -rw-r--r-- | arch/arm/mach-dove/dove-db-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-dove/dove-db-setup.c b/arch/arm/mach-dove/dove-db-setup.c index 2ac34ecfa745..11ea34e4fc76 100644 --- a/arch/arm/mach-dove/dove-db-setup.c +++ b/arch/arm/mach-dove/dove-db-setup.c | |||
| @@ -94,7 +94,7 @@ static void __init dove_db_init(void) | |||
| 94 | } | 94 | } |
| 95 | 95 | ||
| 96 | MACHINE_START(DOVE_DB, "Marvell DB-MV88AP510-BP Development Board") | 96 | MACHINE_START(DOVE_DB, "Marvell DB-MV88AP510-BP Development Board") |
| 97 | .boot_params = 0x00000100, | 97 | .atag_offset = 0x100, |
| 98 | .init_machine = dove_db_init, | 98 | .init_machine = dove_db_init, |
| 99 | .map_io = dove_map_io, | 99 | .map_io = dove_map_io, |
| 100 | .init_early = dove_init_early, | 100 | .init_early = dove_init_early, |