summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mxc91231/magx-zn5.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-03-03 02:29:32 +0300
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-03-03 02:29:32 +0300
commitb93a4afcff7be859e30cad2a305731516057d6cf (patch)
treefb5fe55864e16527e453efd18790a34db22ee2a1 /arch/arm/mach-mxc91231/magx-zn5.c
parent62c132a8008991530839401674ce8e1b12b005d3 (diff)
parent9b1489e989695c4d502865f8bec616c0f17e99ab (diff)
downloadlinux-b93a4afcff7be859e30cad2a305731516057d6cf.tar.xz
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Conflicts: arch/arm/Makefile
Diffstat (limited to 'arch/arm/mach-mxc91231/magx-zn5.c')
-rw-r--r--arch/arm/mach-mxc91231/magx-zn5.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mxc91231/magx-zn5.c b/arch/arm/mach-mxc91231/magx-zn5.c
index 7dbe4ca12efd..69816ba82930 100644
--- a/arch/arm/mach-mxc91231/magx-zn5.c
+++ b/arch/arm/mach-mxc91231/magx-zn5.c
@@ -55,7 +55,7 @@ struct sys_timer zn5_timer = {
MACHINE_START(MAGX_ZN5, "Motorola Zn5")
.phys_io = MXC91231_AIPS1_BASE_ADDR,
.io_pg_offst = ((MXC91231_AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc,
- .boot_params = PHYS_OFFSET + 0x100,
+ .boot_params = MXC91231_PHYS_OFFSET + 0x100,
.map_io = mxc91231_map_io,
.init_irq = mxc91231_init_irq,
.timer = &zn5_timer,