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-rpc/riscpc.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-rpc/riscpc.c')
| -rw-r--r-- | arch/arm/mach-rpc/riscpc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-rpc/riscpc.c b/arch/arm/mach-rpc/riscpc.c index 580b3c73d2c7..a9241eb87724 100644 --- a/arch/arm/mach-rpc/riscpc.c +++ b/arch/arm/mach-rpc/riscpc.c | |||
| @@ -218,7 +218,7 @@ extern struct sys_timer ioc_timer; | |||
| 218 | 218 | ||
| 219 | MACHINE_START(RISCPC, "Acorn-RiscPC") | 219 | MACHINE_START(RISCPC, "Acorn-RiscPC") |
| 220 | /* Maintainer: Russell King */ | 220 | /* Maintainer: Russell King */ |
| 221 | .boot_params = 0x10000100, | 221 | .atag_offset = 0x100, |
| 222 | .reserve_lp0 = 1, | 222 | .reserve_lp0 = 1, |
| 223 | .reserve_lp1 = 1, | 223 | .reserve_lp1 = 1, |
| 224 | .map_io = rpc_map_io, | 224 | .map_io = rpc_map_io, |