diff --git a/[refs] b/[refs] index 37e5ab794b1e..9868823030e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b3fe124389f9dd97f0bbd954da2910e286648f0f +refs/heads/master: 6717ef1aa750b54ddb9d8854b91707ee21f0ad23 diff --git a/trunk/kernel/power/Kconfig b/trunk/kernel/power/Kconfig index 1436c47cb39b..b45da40e8d25 100644 --- a/trunk/kernel/power/Kconfig +++ b/trunk/kernel/power/Kconfig @@ -82,7 +82,7 @@ config PM_SLEEP_SMP config PM_SLEEP bool - depends on SUSPEND || HIBERNATION || XEN + depends on SUSPEND || HIBERNATION default y config SUSPEND