diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-22 16:49:52 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-22 16:49:52 -0400 |
commit | 474aa3dd3e1f3ae410115fe6624ba48fc9791bc5 (patch) | |
tree | fcc7de41f698eb7eb018e992d60494bb60833a24 /drivers/irqchip/Makefile | |
parent | 5a79d596378b65e773d93d00edcb57a33f87ea94 (diff) | |
parent | f61f86068cdf7e59de64d430fd3cc907a8e102f2 (diff) |
Merge tag 'irqchip-core-4.9' of git://git.infradead.org/users/jcooper/linux into irq/core
Pull irqchip core changes for v4.9 from Jason Cooper
- jcore: Add AIC driver
- mips-gic: Use for_each_set_bit
- mvebu: Add PIC driver
Diffstat (limited to 'drivers/irqchip/Makefile')
-rw-r--r-- | drivers/irqchip/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index 96383b22cffe..b372e792adc2 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile | |||
@@ -40,6 +40,7 @@ obj-$(CONFIG_I8259) += irq-i8259.o | |||
40 | obj-$(CONFIG_IMGPDC_IRQ) += irq-imgpdc.o | 40 | obj-$(CONFIG_IMGPDC_IRQ) += irq-imgpdc.o |
41 | obj-$(CONFIG_IRQ_MIPS_CPU) += irq-mips-cpu.o | 41 | obj-$(CONFIG_IRQ_MIPS_CPU) += irq-mips-cpu.o |
42 | obj-$(CONFIG_SIRF_IRQ) += irq-sirfsoc.o | 42 | obj-$(CONFIG_SIRF_IRQ) += irq-sirfsoc.o |
43 | obj-$(CONFIG_JCORE_AIC) += irq-jcore-aic.o | ||
43 | obj-$(CONFIG_RENESAS_INTC_IRQPIN) += irq-renesas-intc-irqpin.o | 44 | obj-$(CONFIG_RENESAS_INTC_IRQPIN) += irq-renesas-intc-irqpin.o |
44 | obj-$(CONFIG_RENESAS_IRQC) += irq-renesas-irqc.o | 45 | obj-$(CONFIG_RENESAS_IRQC) += irq-renesas-irqc.o |
45 | obj-$(CONFIG_VERSATILE_FPGA_IRQ) += irq-versatile-fpga.o | 46 | obj-$(CONFIG_VERSATILE_FPGA_IRQ) += irq-versatile-fpga.o |
@@ -68,6 +69,7 @@ obj-$(CONFIG_INGENIC_IRQ) += irq-ingenic.o | |||
68 | obj-$(CONFIG_IMX_GPCV2) += irq-imx-gpcv2.o | 69 | obj-$(CONFIG_IMX_GPCV2) += irq-imx-gpcv2.o |
69 | obj-$(CONFIG_PIC32_EVIC) += irq-pic32-evic.o | 70 | obj-$(CONFIG_PIC32_EVIC) += irq-pic32-evic.o |
70 | obj-$(CONFIG_MVEBU_ODMI) += irq-mvebu-odmi.o | 71 | obj-$(CONFIG_MVEBU_ODMI) += irq-mvebu-odmi.o |
72 | obj-$(CONFIG_MVEBU_PIC) += irq-mvebu-pic.o | ||
71 | obj-$(CONFIG_LS_SCFG_MSI) += irq-ls-scfg-msi.o | 73 | obj-$(CONFIG_LS_SCFG_MSI) += irq-ls-scfg-msi.o |
72 | obj-$(CONFIG_EZNPS_GIC) += irq-eznps.o | 74 | obj-$(CONFIG_EZNPS_GIC) += irq-eznps.o |
73 | obj-$(CONFIG_ARCH_ASPEED) += irq-aspeed-vic.o | 75 | obj-$(CONFIG_ARCH_ASPEED) += irq-aspeed-vic.o |