diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2015-04-10 22:57:56 +0000 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2015-04-10 22:57:56 +0000 |
| commit | 07c523f1493b6860662e74a3d7e1ae0e7d67d416 (patch) | |
| tree | 8d8edfc4f8ba1c985e1b8ca032beadf04323cc01 /include | |
| parent | 37b25fffd1435dd9b77ac5882a6791f7d5691097 (diff) | |
| parent | 7136d457f365ecc93ddffcdd42ab49a8473f260b (diff) | |
Merge branch 'irqchip/stacked-omap' into irqchip/core
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/irq.h | 1 | ||||
| -rw-r--r-- | include/linux/irqchip/arm-gic.h | 6 | ||||
| -rw-r--r-- | include/linux/irqchip/irq-crossbar.h | 11 |
3 files changed, 1 insertions, 17 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h index d09ec7a1243e..3057c48e4933 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h @@ -460,6 +460,7 @@ extern void irq_chip_eoi_parent(struct irq_data *data); extern int irq_chip_set_affinity_parent(struct irq_data *data, const struct cpumask *dest, bool force); +extern int irq_chip_set_wake_parent(struct irq_data *data, unsigned int on); #endif /* Handling of unhandled and spurious interrupts: */ diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h index 71d706d5f169..3978c5be4edc 100644 --- a/include/linux/irqchip/arm-gic.h +++ b/include/linux/irqchip/arm-gic.h @@ -115,11 +115,5 @@ int gic_get_cpu_id(unsigned int cpu); void gic_migrate_target(unsigned int new_cpu_id); unsigned long gic_get_sgir_physaddr(void); -extern const struct irq_domain_ops *gic_routable_irq_domain_ops; -static inline void __init register_routable_domain_ops - (const struct irq_domain_ops *ops) -{ - gic_routable_irq_domain_ops = ops; -} #endif /* __ASSEMBLY */ #endif diff --git a/include/linux/irqchip/irq-crossbar.h b/include/linux/irqchip/irq-crossbar.h deleted file mode 100644 index e5537b81df8d..000000000000 --- a/include/linux/irqchip/irq-crossbar.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * drivers/irqchip/irq-crossbar.h - * - * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - */ -int irqcrossbar_init(void); |