summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-generic.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-11-01 13:47:27 +0100
committerArnd Bergmann <arnd@arndb.de>2011-11-01 13:47:27 +0100
commitdf80442d1ee2902c2e39f90f18160f2e08d14c06 (patch)
treee7c2080df1a5851e0c5353c48a211d9af91aae68 /arch/arm/mach-omap2/board-generic.c
parent8aca3ab5865f8cfbde841b6daf9442cc2279ced3 (diff)
parent0cdc8b921d68817b687755b4f6ae20cd8ff1d026 (diff)
Merge branch 'depends/rmk/memory_h' into next/cleanup2
Theis resolves lots of simple conflicts between the omap cleanup and the mach/memory.h removal series. Conflicts: arch/arm/mach-imx/mach-cpuimx27.c arch/arm/mach-omap1/board-ams-delta.c arch/arm/mach-omap1/board-generic.c arch/arm/mach-omap1/board-h2.c arch/arm/mach-omap1/board-h3.c arch/arm/mach-omap1/board-nokia770.c arch/arm/mach-omap1/board-osk.c arch/arm/mach-omap1/board-palmte.c arch/arm/mach-omap1/board-palmtt.c arch/arm/mach-omap1/board-palmz71.c arch/arm/mach-omap1/board-sx1.c arch/arm/mach-omap1/board-voiceblue.c arch/arm/mach-omap1/io.c arch/arm/mach-omap2/board-generic.c arch/arm/mach-omap2/io.c arch/arm/plat-omap/io.c Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap2/board-generic.c')
-rw-r--r--arch/arm/mach-omap2/board-generic.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index d9ccb9d98e1..0c427976d62 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -92,6 +92,7 @@ static const char *omap242x_boards_compat[] __initdata = {
};
DT_MACHINE_START(OMAP242X_DT, "Generic OMAP2420 (Flattened Device Tree)")
+ .atag_offset = 0x100,
.reserve = omap_reserve,
.map_io = omap242x_map_io,
.init_early = omap2420_init_early,
@@ -109,6 +110,7 @@ static const char *omap243x_boards_compat[] __initdata = {
};
DT_MACHINE_START(OMAP243X_DT, "Generic OMAP2430 (Flattened Device Tree)")
+ .atag_offset = 0x100,
.reserve = omap_reserve,
.map_io = omap243x_map_io,
.init_early = omap2430_init_early,
@@ -126,6 +128,7 @@ static const char *omap3_boards_compat[] __initdata = {
};
DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)")
+ .atag_offset = 0x100,
.reserve = omap_reserve,
.map_io = omap3_map_io,
.init_early = omap3430_init_early,
@@ -143,6 +146,7 @@ static const char *omap4_boards_compat[] __initdata = {
};
DT_MACHINE_START(OMAP4_DT, "Generic OMAP4 (Flattened Device Tree)")
+ .atag_offset = 0x100,
.reserve = omap_reserve,
.map_io = omap4_map_io,
.init_early = omap4430_init_early,