Commit 40c431a5 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 4def1963 f5d707ed
...@@ -3,6 +3,9 @@ ...@@ -3,6 +3,9 @@
# ACPI Configuration # ACPI Configuration
# #
config ARCH_SUPPORTS_ACPI
bool
menuconfig ACPI menuconfig ACPI
bool "ACPI (Advanced Configuration and Power Interface) Support" bool "ACPI (Advanced Configuration and Power Interface) Support"
depends on ARCH_SUPPORTS_ACPI depends on ARCH_SUPPORTS_ACPI
...@@ -40,9 +43,6 @@ menuconfig ACPI ...@@ -40,9 +43,6 @@ menuconfig ACPI
<http://www.acpi.info> <http://www.acpi.info>
<http://www.uefi.org/acpi/specs> <http://www.uefi.org/acpi/specs>
config ARCH_SUPPORTS_ACPI
bool
if ACPI if ACPI
config ACPI_LEGACY_TABLES_LOOKUP config ACPI_LEGACY_TABLES_LOOKUP
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment