diff options
| author | Marc Zyngier <maz@kernel.org> | 2023-02-06 17:26:11 +0000 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2023-02-06 17:26:11 +0000 |
| commit | df2d85d0b0b5b1533d6db9079f0a0a7b73ef6a9e (patch) | |
| tree | a11141d24ef36ddd12257a3189611e848cde4444 /drivers/irqchip/Kconfig | |
| parent | 5f61c6931b18369798e561aa378d5ea6236bcdef (diff) | |
| parent | 9c1a7bfc2993112cfb3056b18301fcafe5c2fde5 (diff) | |
Merge branch irq/misc-6.3 into irq/irqchip-next
* irq/misc-6.3:
: .
: - Cleanup Kconfig dependencies for LS_SCFG_MSI
:
: - Improve save/restore for the loongson-liointc irqchip
:
: - Correctly initialise status and enable registers for one
: of the ASpeed controllers
: .
irqchip/ls-scfg-msi: Simplify Kconfig dependencies
irqchip/loongson-liointc: Save/restore int_edge/int_pol registers during S3/S4
irqchip/aspeed-scu-ic: Correctly initialise status and enable registers
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'drivers/irqchip/Kconfig')
| -rw-r--r-- | drivers/irqchip/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index cbf504794e7c..7abdb98f805d 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -389,7 +389,7 @@ config LS_EXTIRQ config LS_SCFG_MSI def_bool y if SOC_LS1021A || ARCH_LAYERSCAPE - depends on PCI && PCI_MSI + depends on PCI_MSI config PARTITION_PERCPU bool |