summaryrefslogtreecommitdiff
path: root/drivers/irqchip/Makefile
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2014-10-02 13:04:45 +0000
committerJason Cooper <jason@lakedaemon.net>2014-10-02 13:04:45 +0000
commitf7472655fbe70f422c08f78d107ca24a791d7b14 (patch)
tree95eda5f2f5404f2de591546493a12dcf1a0c4c81 /drivers/irqchip/Makefile
parenta778bf35bd928653a0d9c9313a56866be8aab59d (diff)
parentfda9203b924a8b4caa68fb4a2df5c954f9eb846a (diff)
Merge branch 'irqchip/broadcom' into irqchip/core
Conflicts: drivers/irqchip/Makefile
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 fc2e4f77d3db..bec790678016 100644
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@ -34,5 +34,6 @@ obj-$(CONFIG_TB10X_IRQC) += irq-tb10x.o
obj-$(CONFIG_XTENSA) += irq-xtensa-pic.o
obj-$(CONFIG_XTENSA_MX) += irq-xtensa-mx.o
obj-$(CONFIG_IRQ_CROSSBAR) += irq-crossbar.o
-obj-$(CONFIG_BRCMSTB_L2_IRQ) += irq-brcmstb-l2.o
+obj-$(CONFIG_BRCMSTB_L2_IRQ) += irq-brcmstb-l2.o \
+ irq-bcm7120-l2.o
obj-$(CONFIG_KEYSTONE_IRQ) += irq-keystone.o