diff options
| author | Sinan Kaya | 2018-12-19 23:46:57 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki | 2018-12-20 10:19:49 +0100 |
| commit | 52146173a0333a8c9fbc1a3dd92958f376511b38 (patch) | |
| tree | e55da0aa9cc3e10e964db1c5636b1f71caf8280d /arch/arm64/Kconfig | |
| parent | PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set (diff) | |
| download | kernel-qcow2-linux-52146173a0333a8c9fbc1a3dd92958f376511b38.tar.gz kernel-qcow2-linux-52146173a0333a8c9fbc1a3dd92958f376511b38.tar.xz kernel-qcow2-linux-52146173a0333a8c9fbc1a3dd92958f376511b38.zip | |
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 <okaya@kernel.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'arch/arm64/Kconfig')
| -rw-r--r-- | arch/arm64/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index ea2ab0330e3a..bcb6262044d8 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 |