summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/board-palmz71.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-omap1/board-palmz71.c
parent976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff)
parent34471a9168c8bfd7f0d00989a7b0797ad27d585e (diff)
downloadtalos-op-linux-3a8254364277fabe01bc0e12b9691722939f5ef3.tar.gz
talos-op-linux-3a8254364277fabe01bc0e12b9691722939f5ef3.zip
Merge remote-tracking branch 'rmk/devel-stable' into HEAD
Diffstat (limited to 'arch/arm/mach-omap1/board-palmz71.c')
-rw-r--r--arch/arm/mach-omap1/board-palmz71.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c
index 9b0ea48d35fd..98e79bc09213 100644
--- a/arch/arm/mach-omap1/board-palmz71.c
+++ b/arch/arm/mach-omap1/board-palmz71.c
@@ -341,7 +341,7 @@ omap_palmz71_map_io(void)
}
MACHINE_START(OMAP_PALMZ71, "OMAP310 based Palm Zire71")
- .boot_params = 0x10000100,
+ .atag_offset = 0x100,
.map_io = omap_palmz71_map_io,
.reserve = omap_reserve,
.init_irq = omap_palmz71_init_irq,
OpenPOWER on IntegriCloud