summaryrefslogtreecommitdiff
path: root/arch/arm/mach-msm/board-halibut.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-31 23:11:46 +0100
committerArnd Bergmann <arnd@arndb.de>2011-10-31 23:11:53 +0100
commit5839fec9d8db35b2b07359b18a77295418e239ad (patch)
treef060f613c7d76b2784a93c96b7b8cd3f0d201254 /arch/arm/mach-msm/board-halibut.c
parent43872fa788060eef91ae437957e0a5e39f1c56fd (diff)
parent0cdc8b921d68817b687755b4f6ae20cd8ff1d026 (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-msm/board-halibut.c')
-rw-r--r--arch/arm/mach-msm/board-halibut.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/board-halibut.c b/arch/arm/mach-msm/board-halibut.c
index 18a3c97bc863..16c86f8b4f3f 100644
--- a/arch/arm/mach-msm/board-halibut.c
+++ b/arch/arm/mach-msm/board-halibut.c
@@ -93,7 +93,7 @@ static void __init halibut_map_io(void)
}
MACHINE_START(HALIBUT, "Halibut Board (QCT SURF7200A)")
- .boot_params = 0x10000100,
+ .atag_offset = 0x100,
.fixup = halibut_fixup,
.map_io = halibut_map_io,
.init_irq = halibut_init_irq,