diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-10-03 09:02:33 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2014-10-03 09:02:33 +0200 |
| commit | 2828c9cdb8bd30f49c48210c014ccdd4cb994931 (patch) | |
| tree | a91d42306e6aca87407df53dfce0d4a9e4eb8e0e /drivers/irqchip/Makefile | |
| parent | db985cbd67c45f875ef43cb5febfaa8cbd203c27 (diff) | |
| parent | fae119b6d427a087be0c6a85431c1b8ee9ffea96 (diff) | |
| download | linux-2828c9cdb8bd30f49c48210c014ccdd4cb994931.tar.bz2 | |
Merge tag 'irqchip-core-3.18-2' of git://git.infradead.org/users/jcooper/linux into irq/core
irqchip core changes for v3.18 (round 2) from Jason Cooper
* atmel:
- Add sama5d4 support
- Correct # irqs for sama5d3
* broadcom:
- Add bcm7120 l2 interrupt controller and DT binding
* gic-v3:
- Add CPU PM notifier
- Add enable/disable support to gic_enable_redist
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 |