Merge branch 'irqchip/hip04' into irqchip/core

cec9694a · Jason Cooper · 1fc9d96e · 8e4bebe0 · cec9694a · cec9694a
Commit cec9694a authored Sep 14, 2014 by Jason Cooper
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 425 additions and 0 deletions

drivers/irqchip/Makefile drivers/irqchip/Makefile +1 -0

drivers/irqchip/irq-hip04.c drivers/irqchip/irq-hip04.c +424 -0

No files found.
--- 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

--- a/drivers/irqchip/irq-hip04.c
+++ b/drivers/irqchip/irq-hip04.c