From: Huacai Chen Date: Thu, 11 Aug 2022 13:06:14 +0000 (+0800) Subject: Merge 'irq/loongarch', 'pci/ctrl/loongson' and 'pci/header-cleanup-immutable' X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6de9eb21cd36151281c7f3e72fc9df18f5c6c083;p=linux.git Merge 'irq/loongarch', 'pci/ctrl/loongson' and 'pci/header-cleanup-immutable' LoongArch architecture changes for 5.20 depend on the irqchip and pci changes to work, so merge them to create a base. --- 6de9eb21cd36151281c7f3e72fc9df18f5c6c083 diff --cc drivers/irqchip/Kconfig index bbb11cb8b0f73,f53164ccdc9f8,4ab1038b54828,4ab1038b54828..a9cd929836311 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@@@@ -298,7 -298,7 -298,7 -298,7 +298,7 @@@@@ config XTENSA_M config XILINX_INTC bool "Xilinx Interrupt Controller IP" - depends on OF -- depends on MICROBLAZE || ARCH_ZYNQ || ARCH_ZYNQMP +++ depends on OF_ADDRESS select IRQ_DOMAIN help Support for the Xilinx Interrupt Controller IP core.