aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/board-rm680.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-rm680.c
parent8efc59ad6764ade520012cb192cd484e5191cd9c (diff)
parentc825dda905bac330c2da7fabdf5c0ac28758b3cd (diff)
Merge branch 'depends/rmk/devel-stable' into next/cleanup
Diffstat (limited to 'arch/arm/mach-omap2/board-rm680.c')
-rw-r--r--arch/arm/mach-omap2/board-rm680.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-rm680.c b/arch/arm/mach-omap2/board-rm680.c
index a98db616e0d..616fb39763b 100644
--- a/arch/arm/mach-omap2/board-rm680.c
+++ b/arch/arm/mach-omap2/board-rm680.c
@@ -144,7 +144,7 @@ static void __init rm680_init(void)
}
MACHINE_START(NOKIA_RM680, "Nokia RM-680 board")
- .boot_params = 0x80000100,
+ .atag_offset = 0x100,
.reserve = omap_reserve,
.map_io = omap3_map_io,
.init_early = omap3630_init_early,