diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-09 14:59:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-09 14:59:05 -0700 |
| commit | 9d88f22a819db8a9ff78496edf5553e90d88179c (patch) | |
| tree | 299883c36423e212fdade7f7a4cb564b028f7f5e /include | |
| parent | 95f3b1f4b1df4716ce2db8aa2243b7e288eeb9a7 (diff) | |
| parent | 1dcc73d7bb0429994c54d33b40c5fb82b741a791 (diff) | |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq updates from Thomas Gleixner:
"Two patches from the irq departement:
- a simple fix to make dummy_irq_chip usable for wakeup scenarios
- removal of the gic arch_extn hackery. Now that all users are
converted we really want to get rid of the interface so people wont
come up with new use cases"
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
irqchip: gic: Drop support for gic_arch_extn
genirq: Set IRQCHIP_SKIP_SET_WAKE flag for dummy_irq_chip
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/irqchip/arm-gic.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h index 36ec4ae74634..9de976b4f9a7 100644 --- a/include/linux/irqchip/arm-gic.h +++ b/include/linux/irqchip/arm-gic.h @@ -95,8 +95,6 @@ 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 *); |