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-footbridge/cats-hw.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-footbridge/cats-hw.c')
-rw-r--r-- | arch/arm/mach-footbridge/cats-hw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-footbridge/cats-hw.c b/arch/arm/mach-footbridge/cats-hw.c index 5b1a8db779be..a3da5d1106c2 100644 --- a/arch/arm/mach-footbridge/cats-hw.c +++ b/arch/arm/mach-footbridge/cats-hw.c | |||
@@ -86,7 +86,7 @@ fixup_cats(struct machine_desc *desc, struct tag *tags, | |||
86 | 86 | ||
87 | MACHINE_START(CATS, "Chalice-CATS") | 87 | MACHINE_START(CATS, "Chalice-CATS") |
88 | /* Maintainer: Philip Blundell */ | 88 | /* Maintainer: Philip Blundell */ |
89 | .boot_params = 0x00000100, | 89 | .atag_offset = 0x100, |
90 | .soft_reboot = 1, | 90 | .soft_reboot = 1, |
91 | .fixup = fixup_cats, | 91 | .fixup = fixup_cats, |
92 | .map_io = footbridge_map_io, | 92 | .map_io = footbridge_map_io, |