diff --git a/[refs] b/[refs]
index 78417c727f38..e4ad0fe19139 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f996fc9671d088bd5f52a70f18c64bfe3d0e418f
+refs/heads/master: ede890c2c069d611ece0e184103a6b9236ce416a
diff --git a/trunk/kernel/power/Kconfig b/trunk/kernel/power/Kconfig
index cb57eb99215f..e45894c696ee 100644
--- a/trunk/kernel/power/Kconfig
+++ b/trunk/kernel/power/Kconfig
@@ -86,6 +86,7 @@ config PM_SLEEP_SMP
 	depends on SMP
 	depends on ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE
 	depends on PM_SLEEP
+	select HOTPLUG
 	select HOTPLUG_CPU
 	default y