summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-omap4panda.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-31 14:23:28 +0100
committerArnd Bergmann <arnd@arndb.de>2011-10-31 14:23:28 +0100
commit929f58aeeb46f964d9468ce1addd993f5d92b11d (patch)
tree95355731bd4d21d221cdc2a5ab073244ff76db65 /arch/arm/mach-omap2/board-omap4panda.c
parentfcd467137ea2da46ffe5cbfdb42e8a2b35f13dad (diff)
parenta26bce1220a4c5a7a074a779e6aad3cae63a94f7 (diff)
downloadblackbird-obmc-linux-929f58aeeb46f964d9468ce1addd993f5d92b11d.tar.gz
blackbird-obmc-linux-929f58aeeb46f964d9468ce1addd993f5d92b11d.zip
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
Diffstat (limited to 'arch/arm/mach-omap2/board-omap4panda.c')
-rw-r--r--arch/arm/mach-omap2/board-omap4panda.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
index 9aaa96057666..683bede73d54 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -583,7 +583,7 @@ static void __init omap4_panda_map_io(void)
MACHINE_START(OMAP4_PANDA, "OMAP4 Panda board")
/* Maintainer: David Anders - Texas Instruments Inc */
- .boot_params = 0x80000100,
+ .atag_offset = 0x100,
.reserve = omap_reserve,
.map_io = omap4_panda_map_io,
.init_early = omap4_panda_init_early,
OpenPOWER on IntegriCloud