diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2013-01-24 13:03:36 +0100 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2013-01-24 13:03:36 +0100 |
| commit | 369e67595ad8f278edf32a65f10ba473baeff03e (patch) | |
| tree | a3bba5b97c6bb522343cf16a216047e9ca99d90c /arch/arm/mach-tegra/common.c | |
| parent | KVM: ARM: Add maintainer entry for KVM/ARM (diff) | |
| parent | irqchip: Move ARM vic.h to include/linux/irqchip/arm-vic.h (diff) | |
| download | linux-369e67595ad8f278edf32a65f10ba473baeff03e.tar.xz linux-369e67595ad8f278edf32a65f10ba473baeff03e.zip | |
Merge remote-tracking branch 'arm-soc/irqchip/gic-vic-move' into kvm-arm/vgic
Diffstat (limited to 'arch/arm/mach-tegra/common.c')
| -rw-r--r-- | arch/arm/mach-tegra/common.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c index d54cfc54b9fe..3599959517b3 100644 --- a/arch/arm/mach-tegra/common.c +++ b/arch/arm/mach-tegra/common.c @@ -21,10 +21,9 @@ #include <linux/io.h> #include <linux/clk.h> #include <linux/delay.h> -#include <linux/of_irq.h> +#include <linux/irqchip.h> #include <asm/hardware/cache-l2x0.h> -#include <asm/hardware/gic.h> #include <mach/powergate.h> @@ -57,15 +56,10 @@ u32 tegra_uart_config[4] = { }; #ifdef CONFIG_OF -static const struct of_device_id tegra_dt_irq_match[] __initconst = { - { .compatible = "arm,cortex-a9-gic", .data = gic_of_init }, - { } -}; - void __init tegra_dt_init_irq(void) { tegra_init_irq(); - of_irq_init(tegra_dt_irq_match); + irqchip_init(); } #endif |