diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-02-21 20:53:46 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-02-21 20:53:46 +0100 |
| commit | fa00cb265e45f62353645c98d67460de64e56aff (patch) | |
| tree | 1a372278f0eb43e66538289670624408d8d9bdfa /drivers/irqchip/Kconfig | |
| parent | f944b5a7aff05a244a6c8cac297819af09a199e4 (diff) | |
| parent | e4e1c0ea731e4a3df470110bfdf8a18d11d59351 (diff) | |
Merge tag 'irqchip-core-4.6' of git://git.infradead.org/users/jcooper/linux into irq/core
Pull irqchip core changes for v4.6 from Jason Cooper:
- mvebu (armada-370-xp)
- MSI support
- Deconflict with mvebu's arm64 code
- ts4800
- Restrict when ts4800 driver can be built
- Make ts4800_ic_ops static const
- bcm2836: Drop superfluous memory barrier
Diffstat (limited to 'drivers/irqchip/Kconfig')
| -rw-r--r-- | drivers/irqchip/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index abe7a571836e..0bd819c6c911 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -60,6 +60,11 @@ config ARM_VIC_NR The maximum number of VICs available in the system, for power management. +config ARMADA_370_XP_IRQ + bool + select GENERIC_IRQ_CHIP + select PCI_MSI_IRQ_DOMAIN if PCI_MSI + config ATMEL_AIC_IRQ bool select GENERIC_IRQ_CHIP @@ -165,6 +170,7 @@ config TS4800_IRQ tristate "TS-4800 IRQ controller" select IRQ_DOMAIN depends on HAS_IOMEM + depends on SOC_IMX51 || COMPILE_TEST help Support for the TS-4800 FPGA IRQ controller |