diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2015-04-10 18:58:19 -0400 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2015-04-10 18:58:19 -0400 |
| commit | a01e7b3258bea93fbf1f028fab1c739d80c61823 (patch) | |
| tree | f78d0d13faa406524a58d9ce64756ffdabb64400 /include/linux/irqchip | |
| parent | fb414e908b15ae3d704aa0572f77981a516279b9 (diff) | |
| parent | 008e4d6735091bfe5be12918cb66c55e178361bf (diff) | |
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.h | 1 |
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; | |||
| 97 | 97 | ||
| 98 | extern struct irq_chip gic_arch_extn; | 98 | extern struct irq_chip gic_arch_extn; |
| 99 | 99 | ||
| 100 | void gic_set_irqchip_flags(unsigned long flags); | ||
| 100 | void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *, | 101 | void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *, |
| 101 | u32 offset, struct device_node *); | 102 | u32 offset, struct device_node *); |
| 102 | void gic_cascade_irq(unsigned int gic_nr, unsigned int irq); | 103 | void gic_cascade_irq(unsigned int gic_nr, unsigned int irq); |