summaryrefslogtreecommitdiff
path: root/include/linux/irqchip
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2015-04-11 01:58:19 +0300
committerJason Cooper <jason@lakedaemon.net>2015-04-11 01:58:19 +0300
commita01e7b3258bea93fbf1f028fab1c739d80c61823 (patch)
treef78d0d13faa406524a58d9ce64756ffdabb64400 /include/linux/irqchip
parentfb414e908b15ae3d704aa0572f77981a516279b9 (diff)
parent008e4d6735091bfe5be12918cb66c55e178361bf (diff)
downloadlinux-a01e7b3258bea93fbf1f028fab1c739d80c61823.tar.xz
Merge branch 'irqchip/stacked-irq_set_wake' into irqchip/core
Conflicts: drivers/irqchip/irq-gic.c
Diffstat (limited to 'include/linux/irqchip')
-rw-r--r--include/linux/irqchip/arm-gic.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
index 3978c5be4edc..36ec4ae74634 100644
--- 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);