diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2014-07-18 22:56:39 +0200 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-07-18 22:56:39 +0200 |
| commit | 20c0c607605244dd237707bb07e7f2ffd82e8aa5 (patch) | |
| tree | 8d03a16493acf9b3c8f6fce030c9c20b3bf208f1 /drivers/irqchip/Makefile | |
| parent | Merge branch 'irqchip/crossbar' into irqchip/core (diff) | |
| parent | irqchip: gic-v3: Initial support for GICv3 (diff) | |
| download | linux-20c0c607605244dd237707bb07e7f2ffd82e8aa5.tar.xz linux-20c0c607605244dd237707bb07e7f2ffd82e8aa5.zip | |
Merge tag 'tags/deps-irqchip-gic-3.17' into irqchip/core
From local branch irqchip/gic, this is topic branch that was set up to
facilitate merging other changes depending on the new GICv3 driver.
Diffstat (limited to 'drivers/irqchip/Makefile')
| -rw-r--r-- | drivers/irqchip/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index 7fba336c4daf..7638221ee552 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -16,7 +16,8 @@ obj-$(CONFIG_ORION_IRQCHIP) += irq-orion.o obj-$(CONFIG_ARCH_SUNXI) += irq-sun4i.o obj-$(CONFIG_ARCH_SUNXI) += irq-sunxi-nmi.o obj-$(CONFIG_ARCH_SPEAR3XX) += spear-shirq.o -obj-$(CONFIG_ARM_GIC) += irq-gic.o +obj-$(CONFIG_ARM_GIC) += irq-gic.o irq-gic-common.o +obj-$(CONFIG_ARM_GIC_V3) += irq-gic-v3.o irq-gic-common.o obj-$(CONFIG_ARM_NVIC) += irq-nvic.o obj-$(CONFIG_ARM_VIC) += irq-vic.o obj-$(CONFIG_IMGPDC_IRQ) += irq-imgpdc.o |