summaryrefslogtreecommitdiff
path: root/include/linux/irqchip
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2015-12-29 10:08:45 +0100
committerThomas Gleixner <tglx@linutronix.de>2015-12-29 10:08:45 +0100
commit92b86f92ed0307efbaea3c0e95520551848d3995 (patch)
tree20db0701571353b7e20a9417516616b4b60ebffa /include/linux/irqchip
parenta4289dc2ec3a5821076a78ee9678909b4eff297e (diff)
parent0644b3daca28dcb320373ae20069c269c9386304 (diff)
Merge branch 'irq/gic-v2m-acpi' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/core
Pull another round of GIC changes from Marc: ACPI support for GIV-v2m
Diffstat (limited to 'include/linux/irqchip')
-rw-r--r--include/linux/irqchip/arm-gic.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
index d0a29db73bc7..9c940263ca23 100644
--- a/include/linux/irqchip/arm-gic.h
+++ b/include/linux/irqchip/arm-gic.h
@@ -116,7 +116,8 @@ int gic_of_init(struct device_node *node, struct device_node *parent);
void gic_init(unsigned int nr, int start,
void __iomem *dist , void __iomem *cpu);
-int gicv2m_of_init(struct device_node *node, struct irq_domain *parent);
+int gicv2m_init(struct fwnode_handle *parent_handle,
+ struct irq_domain *parent);
void gic_send_sgi(unsigned int cpu_id, unsigned int irq);
int gic_get_cpu_id(unsigned int cpu);