diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2014-07-18 20:58:34 +0000 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-07-18 20:58:34 +0000 |
| commit | f0cf9d2facbe3aa93b302058c013729cbc1bca22 (patch) | |
| tree | 272bdf38e50d723fc88ef1fa068582087b6b8b27 /drivers/irqchip/Makefile | |
| parent | 20c0c607605244dd237707bb07e7f2ffd82e8aa5 (diff) | |
| parent | 6704d12d688192366f3a70e6f8a85cb5a869cd5a (diff) | |
| download | linux-f0cf9d2facbe3aa93b302058c013729cbc1bca22.tar.gz linux-f0cf9d2facbe3aa93b302058c013729cbc1bca22.tar.bz2 linux-f0cf9d2facbe3aa93b302058c013729cbc1bca22.zip | |
Merge branch 'irqchip/atmel-aic' into irqchip/core
Topic branch set up to facilitate merging the rest of the series which
removes the driver from arch code.
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 7638221ee552..73052ba9ca62 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -20,6 +20,8 @@ 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_ATMEL_AIC_IRQ) += irq-atmel-aic-common.o irq-atmel-aic.o +obj-$(CONFIG_ATMEL_AIC5_IRQ) += irq-atmel-aic-common.o irq-atmel-aic5.o obj-$(CONFIG_IMGPDC_IRQ) += irq-imgpdc.o obj-$(CONFIG_SIRF_IRQ) += irq-sirfsoc.o obj-$(CONFIG_RENESAS_INTC_IRQPIN) += irq-renesas-intc-irqpin.o |