summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-cm-t35.c
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2011-10-24 14:02:37 -0500
committerRob Herring <rob.herring@calxeda.com>2011-10-24 14:02:37 -0500
commit3a8254364277fabe01bc0e12b9691722939f5ef3 (patch)
tree0befa43780509144cc840f767859006409e0506d /arch/arm/mach-omap2/board-cm-t35.c
parent976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff)
parent34471a9168c8bfd7f0d00989a7b0797ad27d585e (diff)
downloadblackbird-op-linux-3a8254364277fabe01bc0e12b9691722939f5ef3.tar.gz
blackbird-op-linux-3a8254364277fabe01bc0e12b9691722939f5ef3.zip
Merge remote-tracking branch 'rmk/devel-stable' into HEAD
Diffstat (limited to 'arch/arm/mach-omap2/board-cm-t35.c')
-rw-r--r--arch/arm/mach-omap2/board-cm-t35.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index 3af8aab435b5..38179c175503 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -634,7 +634,7 @@ static void __init cm_t3730_init(void)
}
MACHINE_START(CM_T35, "Compulab CM-T35")
- .boot_params = 0x80000100,
+ .atag_offset = 0x100,
.reserve = omap_reserve,
.map_io = omap3_map_io,
.init_early = cm_t35_init_early,
@@ -644,7 +644,7 @@ MACHINE_START(CM_T35, "Compulab CM-T35")
MACHINE_END
MACHINE_START(CM_T3730, "Compulab CM-T3730")
- .boot_params = 0x80000100,
+ .atag_offset = 0x100,
.reserve = omap_reserve,
.map_io = omap3_map_io,
.init_early = cm_t35_init_early,
OpenPOWER on IntegriCloud