summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/mach-eukrea_cpuimx25.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-31 14:23:28 +0100
committerArnd Bergmann <arnd@arndb.de>2011-10-31 14:23:28 +0100
commit929f58aeeb46f964d9468ce1addd993f5d92b11d (patch)
tree95355731bd4d21d221cdc2a5ab073244ff76db65 /arch/arm/mach-imx/mach-eukrea_cpuimx25.c
parentMerge branch 'depends/rmk/smp' into tmp (diff)
parentARM: 7127/1: hw_breakpoint: skip v7-specific reset on v6 cores (diff)
downloadlinux-929f58aeeb46f964d9468ce1addd993f5d92b11d.tar.xz
linux-929f58aeeb46f964d9468ce1addd993f5d92b11d.zip
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
Diffstat (limited to 'arch/arm/mach-imx/mach-eukrea_cpuimx25.c')
-rw-r--r--arch/arm/mach-imx/mach-eukrea_cpuimx25.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-eukrea_cpuimx25.c b/arch/arm/mach-imx/mach-eukrea_cpuimx25.c
index 2442d5da883d..9163318e95a2 100644
--- a/arch/arm/mach-imx/mach-eukrea_cpuimx25.c
+++ b/arch/arm/mach-imx/mach-eukrea_cpuimx25.c
@@ -163,7 +163,7 @@ static struct sys_timer eukrea_cpuimx25_timer = {
MACHINE_START(EUKREA_CPUIMX25SD, "Eukrea CPUIMX25")
/* Maintainer: Eukrea Electromatique */
- .boot_params = MX25_PHYS_OFFSET + 0x100,
+ .atag_offset = 0x100,
.map_io = mx25_map_io,
.init_early = imx25_init_early,
.init_irq = mx25_init_irq,