diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-08-31 20:12:51 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-08-31 20:12:51 +0200 |
| commit | 9fbd7fd28d1a1053325967670915c12b4b246a61 (patch) | |
| tree | 9a462e5af1e90ef6c68b96fff75cad141e1a784f /drivers/irqchip/irq-armada-370-xp.c | |
| parent | b33394ba5c0974a578c24b2fecbb91a984da5e09 (diff) | |
| parent | ae3efabfadea92a7300f57792ebeb24b5d18469f (diff) | |
| download | linux-9fbd7fd28d1a1053325967670915c12b4b246a61.tar.bz2 | |
Merge tag 'irqchip-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/core
Pull irqchip updates for 4.14 from Marc Zyngier:
- irqchip-specific part of the monster GICv4 series
- new UniPhier AIDET irqchip driver
- new variants of some Freescale MSI widget
- blanket removal of of_node->full_name in printk
- random collection of fixes
Diffstat (limited to 'drivers/irqchip/irq-armada-370-xp.c')
| -rw-r--r-- | drivers/irqchip/irq-armada-370-xp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c index eb815676c088..c9bdc5221b82 100644 --- a/drivers/irqchip/irq-armada-370-xp.c +++ b/drivers/irqchip/irq-armada-370-xp.c @@ -203,7 +203,7 @@ static struct irq_chip armada_370_xp_msi_irq_chip = { static struct msi_domain_info armada_370_xp_msi_domain_info = { .flags = (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS | - MSI_FLAG_MULTI_PCI_MSI), + MSI_FLAG_MULTI_PCI_MSI | MSI_FLAG_PCI_MSIX), .chip = &armada_370_xp_msi_irq_chip, }; |