From: Sinan Kaya Date: Wed, 19 Dec 2018 22:46:57 +0000 (+0000) Subject: arm64: select ACPI PCI code only when both features are enabled X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=52146173a0333a8c9fbc1a3dd92958f376511b38;p=linux.git arm64: select ACPI PCI code only when both features are enabled ACPI and PCI are no longer coupled to each other. Specify requirements for both when pulling in code. Signed-off-by: Sinan Kaya Acked-by: Catalin Marinas Signed-off-by: Rafael J. Wysocki --- diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index ea2ab0330e3a1..bcb6262044d80 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -5,7 +5,7 @@ config ARM64 select ACPI_GTDT if ACPI select ACPI_IORT if ACPI select ACPI_REDUCED_HARDWARE_ONLY if ACPI - select ACPI_MCFG if ACPI + select ACPI_MCFG if (ACPI && PCI) select ACPI_SPCR_TABLE if ACPI select ACPI_PPTT if ACPI select ARCH_CLOCKSOURCE_DATA @@ -163,7 +163,7 @@ config ARM64 select OF select OF_EARLY_FLATTREE select OF_RESERVED_MEM - select PCI_ECAM if ACPI + select PCI_ECAM if (ACPI && PCI) select POWER_RESET select POWER_SUPPLY select REFCOUNT_FULL