aboutsummaryrefslogtreecommitdiff
path: root/drivers/irqchip/Makefile
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2014-07-18 20:56:39 +0000
committerJason Cooper <jason@lakedaemon.net>2014-07-18 20:56:39 +0000
commit20c0c607605244dd237707bb07e7f2ffd82e8aa5 (patch)
tree8d03a16493acf9b3c8f6fce030c9c20b3bf208f1 /drivers/irqchip/Makefile
parent885d078bfe92abfd5965a4f8846a3e72648ac9a6 (diff)
parent021f653791ad17e03f98aaa7fb933816ae16f161 (diff)
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/Makefile3
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