summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-omap3stalker.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-omap2/board-omap3stalker.c
parent8efc59ad6764ade520012cb192cd484e5191cd9c (diff)
parentc825dda905bac330c2da7fabdf5c0ac28758b3cd (diff)
downloadtalos-op-linux-71f2c153755442c05d15cd025484f676a5f3541f.tar.gz
talos-op-linux-71f2c153755442c05d15cd025484f676a5f3541f.zip
Merge branch 'depends/rmk/devel-stable' into next/cleanup
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3stalker.c')
-rw-r--r--arch/arm/mach-omap2/board-omap3stalker.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c
index fa58a0f1584a..170e1ebd6e62 100644
--- a/arch/arm/mach-omap2/board-omap3stalker.c
+++ b/arch/arm/mach-omap2/board-omap3stalker.c
@@ -484,7 +484,7 @@ static void __init omap3_stalker_init(void)
MACHINE_START(SBC3530, "OMAP3 STALKER")
/* Maintainer: Jason Lam -lzg@ema-tech.com */
- .boot_params = 0x80000100,
+ .atag_offset = 0x100,
.map_io = omap3_map_io,
.init_early = omap35xx_init_early,
.init_irq = omap3_init_irq,
OpenPOWER on IntegriCloud