Merge branch 'irqchip/hip04' into irqchip/core

git-mirror · Sep 14, 2014 · cec9694 · cec9694
2 parents 1fc9d96 + 8e4bebe
commit cec9694
Show file tree

Hide file tree

Showing 2 changed files with 425 additions and 0 deletions.
diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile
@@ -2,6 +2,7 @@ obj-$(CONFIG_IRQCHIP)			+= irqchip.o
 
 obj-$(CONFIG_ARCH_BCM2835)		+= irq-bcm2835.o
 obj-$(CONFIG_ARCH_EXYNOS)		+= exynos-combiner.o
+obj-$(CONFIG_ARCH_HIP04)		+= irq-hip04.o
 obj-$(CONFIG_ARCH_MMP)			+= irq-mmp.o
 obj-$(CONFIG_ARCH_MVEBU)		+= irq-armada-370-xp.o
 obj-$(CONFIG_ARCH_MXS)			+= irq-mxs.o