diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-24 09:29:44 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-24 09:29:44 -0700 |
commit | 40c431a5a5c2333079c67b03de6c0470e8306374 (patch) | |
tree | 511f13f33ffd0e94a76a9c750c1cd32c2b643448 | |
parent | 4def1963608ed2b61aca5b52fdedb4ca2798820c (diff) | |
parent | f5d707ede37a962bc3cb9b3f8531a870dae29e46 (diff) |
Merge tag 'acpi-4.19-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI Kconfig fix from Rafael Wysocki:
"Fix recent menuconfig breakage causing it to present ACPI-specific
options incorrectly (Arnd Bergmann)"
* tag 'acpi-4.19-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI: fix menuconfig presentation of ACPI submenu
-rw-r--r-- | drivers/acpi/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 4a46344bf0e3..dd1eea90f67f 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -3,6 +3,9 @@ # ACPI Configuration # +config ARCH_SUPPORTS_ACPI + bool + menuconfig ACPI bool "ACPI (Advanced Configuration and Power Interface) Support" depends on ARCH_SUPPORTS_ACPI @@ -40,9 +43,6 @@ menuconfig ACPI <http://www.acpi.info> <http://www.uefi.org/acpi/specs> -config ARCH_SUPPORTS_ACPI - bool - if ACPI config ACPI_LEGACY_TABLES_LOOKUP |