diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-07-24 11:48:45 +0200 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2018-07-24 12:34:48 +0100 |
| commit | 2c870e61132c082a03769d2ac0a2849ba33c10e3 (patch) | |
| tree | fe1cea47471519d279cb6c57564121d05c912988 /arch/x86/Kconfig | |
| parent | b965746306bcb058a6876d3a61b502d3dbb9fe91 (diff) | |
| download | linux-stable-2c870e61132c082a03769d2ac0a2849ba33c10e3.tar.gz linux-stable-2c870e61132c082a03769d2ac0a2849ba33c10e3.tar.bz2 linux-stable-2c870e61132c082a03769d2ac0a2849ba33c10e3.zip | |
arm64: fix ACPI dependencies
Kconfig reports a warning on x86 builds after the ARM64 dependency
was added.
drivers/acpi/Kconfig:6:error: recursive dependency detected!
drivers/acpi/Kconfig:6: symbol ACPI depends on EFI
This rephrases the dependency to keep the ARM64 details out of the
shared Kconfig file, so Kconfig no longer gets confused by it.
For consistency, all three architectures that support ACPI now
select ARCH_SUPPORTS_ACPI in exactly the configuration in which
they allow it. We still need the 'default x86', as each one
wants a different default: default-y on x86, default-n on arm64,
and always-y on ia64.
Fixes: 5bcd44083a08 ("drivers: acpi: add dependency of EFI for arm64")
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index f1dbb4ee19d7..ee99f5296570 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -75,6 +75,7 @@ config X86 select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_SERIO + select ARCH_SUPPORTS_ACPI select ARCH_SUPPORTS_ATOMIC_RMW select ARCH_SUPPORTS_NUMA_BALANCING if X86_64 select ARCH_USE_BUILTIN_BSWAP |