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/lsmini-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/lsmini-setup.c')
| -rw-r--r-- | arch/arm/mach-orion5x/lsmini-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/lsmini-setup.c b/arch/arm/mach-orion5x/lsmini-setup.c index 9c82723c05c0..743f7f1db181 100644 --- a/arch/arm/mach-orion5x/lsmini-setup.c +++ b/arch/arm/mach-orion5x/lsmini-setup.c | |||
| @@ -267,7 +267,7 @@ static void __init lsmini_init(void) | |||
| 267 | #ifdef CONFIG_MACH_LINKSTATION_MINI | 267 | #ifdef CONFIG_MACH_LINKSTATION_MINI |
| 268 | MACHINE_START(LINKSTATION_MINI, "Buffalo Linkstation Mini") | 268 | MACHINE_START(LINKSTATION_MINI, "Buffalo Linkstation Mini") |
| 269 | /* Maintainer: Alexey Kopytko <alexey@kopytko.ru> */ | 269 | /* Maintainer: Alexey Kopytko <alexey@kopytko.ru> */ |
| 270 | .boot_params = 0x00000100, | 270 | .atag_offset = 0x100, |
| 271 | .init_machine = lsmini_init, | 271 | .init_machine = lsmini_init, |
| 272 | .map_io = orion5x_map_io, | 272 | .map_io = orion5x_map_io, |
| 273 | .init_early = orion5x_init_early, | 273 | .init_early = orion5x_init_early, |