[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20190716040441.12101-1-sashal@kernel.org>
Date: Tue, 16 Jul 2019 00:04:41 -0400
From: Sasha Levin <sashal@...nel.org>
To: marc.zyngier@....com, will.deacon@....com, julien.thierry@....com,
catalin.marinas@....com
Cc: okaya@...nel.org, linux-kernel@...r.kernel.org,
linux-kernel@...rosoft.com, linux-acpi@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org,
Sasha Levin <sashal@...nel.org>, stable@...nel.org
Subject: [PATCH] ARM64/irqchip: Make ACPI_IORT depend on PCI again
ACPI_IORT lost it's explicit dependency on PCI in c6bb8f89fa6df
("ARM64/irqchip: Update ACPI_IORT symbol selection logic") where the
author has relied on the general dependency of ACPI on PCI.
However, that dependency was finally removed in 5d32a66541c4 ("PCI/ACPI:
Allow ACPI to be built without CONFIG_PCI set") and now ACPI_IORT breaks
when we try and build it without PCI support.
This patch brings back the explicit dependency of ACPI_IORT on PCI.
Fixes: 5d32a66541c4 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set")
Cc: stable@...nel.org
Signed-off-by: Sasha Levin <sashal@...nel.org>
---
arch/arm64/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index a36ff61321ce..d6d93027196b 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -4,7 +4,7 @@ config ARM64
select ACPI_CCA_REQUIRED if ACPI
select ACPI_GENERIC_GSI if ACPI
select ACPI_GTDT if ACPI
- select ACPI_IORT if ACPI
+ select ACPI_IORT if (ACPI && PCI)
select ACPI_REDUCED_HARDWARE_ONLY if ACPI
select ACPI_MCFG if (ACPI && PCI)
select ACPI_SPCR_TABLE if ACPI
--
2.20.1
Powered by blists - more mailing lists