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-orion5x/db88f5281-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-orion5x/db88f5281-setup.c')
| -rw-r--r-- | arch/arm/mach-orion5x/db88f5281-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c index 6d771cbf06a4..4b79a80d5e1f 100644 --- a/arch/arm/mach-orion5x/db88f5281-setup.c +++ b/arch/arm/mach-orion5x/db88f5281-setup.c | |||
| @@ -358,7 +358,7 @@ static void __init db88f5281_init(void) | |||
| 358 | 358 | ||
| 359 | MACHINE_START(DB88F5281, "Marvell Orion-2 Development Board") | 359 | MACHINE_START(DB88F5281, "Marvell Orion-2 Development Board") |
| 360 | /* Maintainer: Tzachi Perelstein <tzachi@marvell.com> */ | 360 | /* Maintainer: Tzachi Perelstein <tzachi@marvell.com> */ |
| 361 | .boot_params = 0x00000100, | 361 | .atag_offset = 0x100, |
| 362 | .init_machine = db88f5281_init, | 362 | .init_machine = db88f5281_init, |
| 363 | .map_io = orion5x_map_io, | 363 | .map_io = orion5x_map_io, |
| 364 | .init_early = orion5x_init_early, | 364 | .init_early = orion5x_init_early, |