diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-07-19 10:14:55 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2014-07-19 10:14:55 +0200 |
| commit | 1b0733837a9b2b8e006c787c628d0085073a5c36 (patch) | |
| tree | 3da13a254cd180bb17064be2befd916f3ba5f26a /include/linux/irq.h | |
| parent | d709f7bcbb3ab01704fa7b37a2e4b981cf3783c1 (diff) | |
| parent | f0cf9d2facbe3aa93b302058c013729cbc1bca22 (diff) | |
| download | talos-op-linux-1b0733837a9b2b8e006c787c628d0085073a5c36.tar.gz talos-op-linux-1b0733837a9b2b8e006c787c628d0085073a5c36.zip | |
Merge tag 'irqchip-core-3.17-3' of git://git.infradead.org/users/jcooper/linux into irq/core
irqchip core changes for v3.17 (round #3) from Jason Cooper
* gic: Add GICv3 driver
* atmel: Move atmel aic driver from arch code to irqchip/
Diffstat (limited to 'include/linux/irq.h')
| -rw-r--r-- | include/linux/irq.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h index 0d998d8b01d8..62af59242ddc 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h @@ -771,6 +771,8 @@ void irq_gc_eoi(struct irq_data *d); int irq_gc_set_wake(struct irq_data *d, unsigned int on); /* Setup functions for irq_chip_generic */ +int irq_map_generic_chip(struct irq_domain *d, unsigned int virq, + irq_hw_number_t hw_irq); struct irq_chip_generic * irq_alloc_generic_chip(const char *name, int nr_ct, unsigned int irq_base, void __iomem *reg_base, irq_flow_handler_t handler); |
