summaryrefslogtreecommitdiff
path: root/arch/arm/mach-integrator/integrator_cp.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-31 13:11:34 (GMT)
committerArnd Bergmann <arnd@arndb.de>2011-10-31 13:11:34 (GMT)
commit09fa31a322c8f03871a741cd1d26e5ca04aacbbd (patch)
treeacdad13d7c332978a91231c4f34b6320a1c7ceb6 /arch/arm/mach-integrator/integrator_cp.c
parent2b228e8cf33dbdd323dd4a05a973c6bd45c44133 (diff)
parentf37a53cc5d8a8fb199e41386d125d8c2ed9e54ef (diff)
downloadlinux-fsl-qoriq-09fa31a322c8f03871a741cd1d26e5ca04aacbbd.tar.xz
Merge branch 'dt/gic' into highbank/soc
Conflicts: arch/arm/Kconfig
Diffstat (limited to 'arch/arm/mach-integrator/integrator_cp.c')
-rw-r--r--arch/arm/mach-integrator/integrator_cp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index 4eb03ab..5de49c3 100644
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -492,7 +492,7 @@ static struct sys_timer cp_timer = {
MACHINE_START(CINTEGRATOR, "ARM-IntegratorCP")
/* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
- .boot_params = 0x00000100,
+ .atag_offset = 0x100,
.reserve = integrator_reserve,
.map_io = intcp_map_io,
.init_early = intcp_init_early,