diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2017-08-14 03:34:10 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2017-08-14 03:34:10 -0400 |
commit | 9c9947f893a254ec92cd5fe1439587e583302c9c (patch) | |
tree | c9653c0d40c80780f63d2d01929103dca7970823 /drivers/irqchip/irq-atmel-aic5.c | |
parent | 8397913303abc9333f376a518a8368fa22ca5e6e (diff) | |
parent | a008873740a3d44946c7e72e456f15146cfd7287 (diff) |
Merge tag 'irqchip-4.13-3' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent
Pull irqchip fixes for 4.13 from Marc Zyngier
Mostly GIC related, again:
- GICv3 ITS NUMA handling fixes
- GICv3 force affinity handling
- Barrier adjustment in both GIC interrupt handling
- Error reporting when the DT presents an incompatible interrupt
- GICv3 platform MSI DT parsing bug fix
- Broadcom L2 PM fix
- Atmel AIC cleanups
Diffstat (limited to 'drivers/irqchip/irq-atmel-aic5.c')
-rw-r--r-- | drivers/irqchip/irq-atmel-aic5.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-atmel-aic5.c b/drivers/irqchip/irq-atmel-aic5.c index c04ee9a23d09..6acad2ea0fb3 100644 --- a/drivers/irqchip/irq-atmel-aic5.c +++ b/drivers/irqchip/irq-atmel-aic5.c | |||
@@ -305,9 +305,9 @@ static const struct irq_domain_ops aic5_irq_ops = { | |||
305 | .xlate = aic5_irq_domain_xlate, | 305 | .xlate = aic5_irq_domain_xlate, |
306 | }; | 306 | }; |
307 | 307 | ||
308 | static void __init sama5d3_aic_irq_fixup(struct device_node *root) | 308 | static void __init sama5d3_aic_irq_fixup(void) |
309 | { | 309 | { |
310 | aic_common_rtc_irq_fixup(root); | 310 | aic_common_rtc_irq_fixup(); |
311 | } | 311 | } |
312 | 312 | ||
313 | static const struct of_device_id aic5_irq_fixups[] __initconst = { | 313 | static const struct of_device_id aic5_irq_fixups[] __initconst = { |