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-kirkwood/rd88f6281-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-kirkwood/rd88f6281-setup.c')
| -rw-r--r-- | arch/arm/mach-kirkwood/rd88f6281-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c index 0f75494d5902..66b3c05e37a6 100644 --- a/arch/arm/mach-kirkwood/rd88f6281-setup.c +++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c | |||
| @@ -115,7 +115,7 @@ subsys_initcall(rd88f6281_pci_init); | |||
| 115 | 115 | ||
| 116 | MACHINE_START(RD88F6281, "Marvell RD-88F6281 Reference Board") | 116 | MACHINE_START(RD88F6281, "Marvell RD-88F6281 Reference Board") |
| 117 | /* Maintainer: Saeed Bishara <saeed@marvell.com> */ | 117 | /* Maintainer: Saeed Bishara <saeed@marvell.com> */ |
| 118 | .boot_params = 0x00000100, | 118 | .atag_offset = 0x100, |
| 119 | .init_machine = rd88f6281_init, | 119 | .init_machine = rd88f6281_init, |
| 120 | .map_io = kirkwood_map_io, | 120 | .map_io = kirkwood_map_io, |
| 121 | .init_early = kirkwood_init_early, | 121 | .init_early = kirkwood_init_early, |