diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-05-18 23:59:13 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-05-18 23:59:33 +0200 |
| commit | 939ef66848ea2b069d938146332fe07e8b6c84af (patch) | |
| tree | 8d69247238065db0437970fe512a9ecfec3a5541 /include/linux/irq.h | |
| parent | 3c646f2c6aa9e918d7fc77867df7f430059f9ccc (diff) | |
| parent | b5cc5cbc116975812917db6de023cde928935910 (diff) | |
| download | lwn-939ef66848ea2b069d938146332fe07e8b6c84af.tar.gz lwn-939ef66848ea2b069d938146332fe07e8b6c84af.zip | |
Merge branch 'irq/for-arm' into irq/core
Pull in the branch which can be consumed by ARM to build their changes
on top.
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 62c6901cab55..2633061364b1 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h @@ -458,6 +458,8 @@ extern void handle_nested_irq(unsigned int irq); extern int irq_chip_compose_msi_msg(struct irq_data *data, struct msi_msg *msg); #ifdef CONFIG_IRQ_DOMAIN_HIERARCHY +extern void irq_chip_enable_parent(struct irq_data *data); +extern void irq_chip_disable_parent(struct irq_data *data); extern void irq_chip_ack_parent(struct irq_data *data); extern int irq_chip_retrigger_hierarchy(struct irq_data *data); extern void irq_chip_mask_parent(struct irq_data *data); |