Merge branch 'irqchip/stacked-irq_set_wake' into irqchip/core

Conflicts: drivers/irqchip/irq-gic.c
2015-04-10 22:58:19 +00:00
parent fb414e908b 008e4d6735
commit a01e7b3258
6 changed files with 10 additions and 14 deletions
--- a/include/linux/irqchip/arm-gic.h
+++ b/include/linux/irqchip/arm-gic.h
@@ -97,6 +97,7 @@ struct device_node;

 extern struct irq_chip gic_arch_extn;

+void gic_set_irqchip_flags(unsigned long flags);
 void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *,
 		    u32 offset, struct device_node *);
 void gic_cascade_irq(unsigned int gic_nr, unsigned int irq);