diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2013-01-24 07:03:36 -0500 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2013-01-24 07:03:36 -0500 |
| commit | 369e67595ad8f278edf32a65f10ba473baeff03e (patch) | |
| tree | a3bba5b97c6bb522343cf16a216047e9ca99d90c /arch/arm/mach-ux500/cpu-db8500.c | |
| parent | a749474de5f0f5902f59acb5c7f4dc6b816ac788 (diff) | |
| parent | 9e47b8bf9815523a5816f2f83e73b13812d74014 (diff) | |
Merge remote-tracking branch 'arm-soc/irqchip/gic-vic-move' into kvm-arm/vgic
Diffstat (limited to 'arch/arm/mach-ux500/cpu-db8500.c')
| -rw-r--r-- | arch/arm/mach-ux500/cpu-db8500.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 5b286e06474c..4c91d767c99c 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <asm/pmu.h> | 27 | #include <asm/pmu.h> |
| 28 | #include <asm/mach/map.h> | 28 | #include <asm/mach/map.h> |
| 29 | #include <asm/mach/arch.h> | 29 | #include <asm/mach/arch.h> |
| 30 | #include <asm/hardware/gic.h> | ||
| 31 | 30 | ||
| 32 | #include <mach/hardware.h> | 31 | #include <mach/hardware.h> |
| 33 | #include <mach/setup.h> | 32 | #include <mach/setup.h> |
| @@ -342,7 +341,6 @@ DT_MACHINE_START(U8500_DT, "ST-Ericsson Ux5x0 platform (Device Tree Support)") | |||
| 342 | .init_irq = ux500_init_irq, | 341 | .init_irq = ux500_init_irq, |
| 343 | /* we re-use nomadik timer here */ | 342 | /* we re-use nomadik timer here */ |
| 344 | .timer = &ux500_timer, | 343 | .timer = &ux500_timer, |
| 345 | .handle_irq = gic_handle_irq, | ||
| 346 | .init_machine = u8500_init_machine, | 344 | .init_machine = u8500_init_machine, |
| 347 | .init_late = NULL, | 345 | .init_late = NULL, |
| 348 | .dt_compat = stericsson_dt_platform_compat, | 346 | .dt_compat = stericsson_dt_platform_compat, |