From a3d7414f39e7f7308b7ef66949281d394b71823c Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Sun, 12 Sep 2010 21:40:01 +0200
Subject: [PATCH] --- yaml --- r: 212359 b: refs/heads/master c:
 ede890c2c069d611ece0e184103a6b9236ce416a h: refs/heads/master i:   212357:
 b3d37bd9f61fe9cb7757aa4dd4e64b8bf16596b5   212355:
 53ac71d9002f1b635029bb91fc831840af8ee4d2   212351:
 522d3db64b55ae6b910e0aa12fe4b77d394e62ef v: v3

---
 [refs]                     | 2 +-
 trunk/kernel/power/Kconfig | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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