summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-msm/board-trout.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-08 21:07:42 +0200
committerArnd Bergmann <arnd@arndb.de>2011-10-08 21:07:42 +0200
commit71f2c153755442c05d15cd025484f676a5f3541f (patch)
treefe48af6ddc33da7a0aaf1a16ed9feeafa4a8e1e1 /arch/arm/mach-msm/board-trout.c
parent8efc59ad6764ade520012cb192cd484e5191cd9c (diff)
parentc825dda905bac330c2da7fabdf5c0ac28758b3cd (diff)
Merge branch 'depends/rmk/devel-stable' into next/cleanup
Diffstat (limited to 'arch/arm/mach-msm/board-trout.c')
-rw-r--r--arch/arm/mach-msm/board-trout.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/board-trout.c b/arch/arm/mach-msm/board-trout.c
index 814386772c6..22d5694f5fe 100644
--- a/arch/arm/mach-msm/board-trout.c
+++ b/arch/arm/mach-msm/board-trout.c
@@ -93,7 +93,7 @@ static void __init trout_map_io(void)
}
MACHINE_START(TROUT, "HTC Dream")
- .boot_params = 0x10000100,
+ .atag_offset = 0x100,
.fixup = trout_fixup,
.map_io = trout_map_io,
.init_irq = trout_init_irq,