diff options
author | Olof Johansson <olof@lixom.net> | 2012-10-01 14:19:17 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-10-01 14:19:17 -0700 |
commit | 6d55d5968a8622f3ea20ec40737aea1cfba6438c (patch) | |
tree | 72481307c22f9b6170591cece793ea24f97a9ddb /arch/arm/mach-ux500/cpu.c | |
parent | f7b967bffefe69f1ad8b79e263237ec1feba7b9b (diff) | |
parent | b6e3b5c2fea9c76617e101cbbc54ed14961f9dee (diff) |
Merge branch 'next/soc' into HEAD
Conflicts:
arch/arm/mach-ux500/clock.c
arch/arm/mach-ux500/cpu.c
drivers/clocksource/Makefile
Diffstat (limited to 'arch/arm/mach-ux500/cpu.c')
-rw-r--r-- | arch/arm/mach-ux500/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c index 8e755638aa76..2236cbd03cd7 100644 --- a/arch/arm/mach-ux500/cpu.c +++ b/arch/arm/mach-ux500/cpu.c @@ -51,7 +51,7 @@ void __init ux500_init_irq(void) gic_arch_extn.flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_MASK_ON_SUSPEND; - if (cpu_is_u8500_family()) { + if (cpu_is_u8500_family() || cpu_is_ux540_family()) { dist_base = __io_address(U8500_GIC_DIST_BASE); cpu_base = __io_address(U8500_GIC_CPU_BASE); } else |