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/arm64/Kconfig | |
parent | b965746306bcb058a6876d3a61b502d3dbb9fe91 (diff) | |
download | lwn-2c870e61132c082a03769d2ac0a2849ba33c10e3.tar.gz lwn-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/arm64/Kconfig')
-rw-r--r-- | arch/arm64/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index e2823362c324..27fd50e86dfe 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1262,6 +1262,7 @@ config EFI bool "UEFI runtime support" depends on OF && !CPU_BIG_ENDIAN depends on KERNEL_MODE_NEON + select ARCH_SUPPORTS_ACPI select LIBFDT select UCS2_STRING select EFI_PARAMS_FROM_FDT |