diff --git a/[refs] b/[refs] index 7ef4ba52c28f..08d0ea24f89a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b19ed915576e8034c3653b4b10b79bde10f69fa +refs/heads/master: 1c61d8c309a4080980474de8c6689527be180782 diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index 206645ac6f6a..f95c3b40e45d 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -1551,7 +1551,6 @@ config HAVE_ARCH_EARLY_PFN_TO_NID depends on NUMA menu "Power management and ACPI options" - depends on !X86_VOYAGER config ARCH_HIBERNATION_HEADER def_bool y