From: Jason Cooper Date: Fri, 18 Jul 2014 20:58:34 +0000 (+0000) Subject: Merge branch 'irqchip/atmel-aic' into irqchip/core X-Git-Tag: android-x86-4.4-r2~341^2~5^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f0cf9d2facbe3aa93b302058c013729cbc1bca22;p=android-x86%2Fkernel.git 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. --- f0cf9d2facbe3aa93b302058c013729cbc1bca22 diff --cc drivers/irqchip/Makefile index 7638221ee552,674e895fa659..73052ba9ca62 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@@ -16,10 -15,11 +16,12 @@@ obj-$(CONFIG_ORION_IRQCHIP) += irq-ori obj-$(CONFIG_ARCH_SUNXI) += irq-sun4i.o obj-$(CONFIG_ARCH_SUNXI) += irq-sunxi-nmi.o obj-$(CONFIG_ARCH_SPEAR3XX) += spear-shirq.o -obj-$(CONFIG_ARM_GIC) += irq-gic.o +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