summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-generic.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-31 14:11:34 +0100
committerArnd Bergmann <arnd@arndb.de>2011-10-31 14:11:34 +0100
commit09fa31a322c8f03871a741cd1d26e5ca04aacbbd (patch)
treeacdad13d7c332978a91231c4f34b6320a1c7ceb6 /arch/arm/mach-omap2/board-generic.c
parent2b228e8cf33dbdd323dd4a05a973c6bd45c44133 (diff)
parentf37a53cc5d8a8fb199e41386d125d8c2ed9e54ef (diff)
Merge branch 'dt/gic' into highbank/soc
Conflicts: arch/arm/Kconfig
Diffstat (limited to 'arch/arm/mach-omap2/board-generic.c')
-rw-r--r--arch/arm/mach-omap2/board-generic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index bb4af05c7f0..4431ad36456 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -65,7 +65,7 @@ static void __init omap_generic_map_io(void)
/* XXX This machine entry name should be updated */
MACHINE_START(OMAP_GENERIC, "Generic OMAP24xx")
/* Maintainer: Paul Mundt <paul.mundt@nokia.com> */
- .boot_params = 0x80000100,
+ .atag_offset = 0x100,
.reserve = omap_reserve,
.map_io = omap_generic_map_io,
.init_early = omap_generic_init_early,