diff --git a/[refs] b/[refs] index f8b77c2626dc..708d02d90547 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c5c606d9dce6e0852a401c57a8b0542acdbb6796 +refs/heads/master: 17993b49b1f540aace8e9b4242530d0b3376eb2a diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index 4a27aa41f6df..148c112c9ca4 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -140,7 +140,6 @@ config HAVE_CPUMASK_OF_CPU_MAP config ARCH_HIBERNATION_POSSIBLE def_bool y - depends on !SMP config ARCH_SUSPEND_POSSIBLE def_bool y