diff --git a/[refs] b/[refs] index a63de63a1e1e..979eba304278 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b4897688011cd05e07f00dcfe6af3331eb36a3c +refs/heads/master: da85f865b1dcec0853c48b763ed312441ce0c7df diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index 6f20718d3156..5d6aa4013dc7 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -1494,7 +1494,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID def_bool X86_64 depends on NUMA -menu "Power management options" +menu "Power management and ACPI options" depends on !X86_VOYAGER config ARCH_HIBERNATION_HEADER