diff --git a/[refs] b/[refs] index d582c5ca96e9..90d8b157a6e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b2bc75c1bde6581d2694cb3ed7fb06b69685008 +refs/heads/master: 9801b321ecdb6708365b6825bf728c8e433fca00 diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig index eb7e8d795c6a..3cce4ed5473d 100644 --- a/trunk/arch/mips/Kconfig +++ b/trunk/arch/mips/Kconfig @@ -2145,11 +2145,11 @@ menu "Power management options" config ARCH_HIBERNATION_POSSIBLE def_bool y - depends on !SMP + depends on SYS_SUPPORTS_HOTPLUG_CPU config ARCH_SUSPEND_POSSIBLE def_bool y - depends on !SMP + depends on SYS_SUPPORTS_HOTPLUG_CPU source "kernel/power/Kconfig"