Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ACPI: fix menuconfig presentation of ACPI submenu

My fix for a recursive Kconfig dependency caused another issue where the
ACPI specific options end up in the top-level menu in 'menuconfig'. This
was an unintended side-effect of having a silent option between
'menuconfig ACPI' and 'if ACPI'.

Moving the ARCH_SUPPORTS_ACPI symbol ahead of the ACPI menu solves that
problem and restores the previous presentation.

Reported-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Fixes: 2c870e61132c (arm64: fix ACPI dependencies)
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

authored by

Arnd Bergmann and committed by
Rafael J. Wysocki
f5d707ed df2def49

+3 -3
+3 -3
drivers/acpi/Kconfig
··· 3 3 # ACPI Configuration 4 4 # 5 5 6 + config ARCH_SUPPORTS_ACPI 7 + bool 8 + 6 9 menuconfig ACPI 7 10 bool "ACPI (Advanced Configuration and Power Interface) Support" 8 11 depends on ARCH_SUPPORTS_ACPI ··· 42 39 The specification is available at: 43 40 <http://www.acpi.info> 44 41 <http://www.uefi.org/acpi/specs> 45 - 46 - config ARCH_SUPPORTS_ACPI 47 - bool 48 42 49 43 if ACPI 50 44