diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2014-10-02 17:04:45 +0400 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-10-02 17:04:45 +0400 |
| commit | f7472655fbe70f422c08f78d107ca24a791d7b14 (patch) | |
| tree | 95eda5f2f5404f2de591546493a12dcf1a0c4c81 /drivers/irqchip/Makefile | |
| parent | a778bf35bd928653a0d9c9313a56866be8aab59d (diff) | |
| parent | fda9203b924a8b4caa68fb4a2df5c954f9eb846a (diff) | |
| download | linux-f7472655fbe70f422c08f78d107ca24a791d7b14.tar.xz | |
Merge branch 'irqchip/broadcom' into irqchip/core
Conflicts:
drivers/irqchip/Makefile
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 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 |