summaryrefslogtreecommitdiff
path: root/kernel/power
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2013-05-21 13:49:35 +1000
committerChanho Park <chanho61.park@samsung.com>2014-11-18 11:48:05 +0900
commita5dc3531e00a6d3bf17d553dde3560557b2f46bc (patch)
tree01ccbe49794b0f7f4bfb34d6668b653de261c0d1 /kernel/power
parentdecaed22ba309765ff9e7229d8df5c6c45504067 (diff)
downloadlinux-3.10-a5dc3531e00a6d3bf17d553dde3560557b2f46bc.tar.gz
linux-3.10-a5dc3531e00a6d3bf17d553dde3560557b2f46bc.tar.bz2
linux-3.10-a5dc3531e00a6d3bf17d553dde3560557b2f46bc.zip
upstream: Finally eradicate CONFIG_HOTPLUG
Ever since commit 45f035ab9b8f ("CONFIG_HOTPLUG should be always on"), it has been basically impossible to build a kernel with CONFIG_HOTPLUG turned off. Remove all the remaining references to it. Cc: Russell King <linux@arm.linux.org.uk> Cc: Doug Thompson <dougthompson@xmission.com> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Steven Whitehouse <swhiteho@redhat.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Pavel Machek <pavel@ucw.cz> Cc: "Rafael J. Wysocki" <rjw@sisk.pl> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com> Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/power')
-rw-r--r--kernel/power/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 5dfdc9ea180..9c39de095ba 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -100,7 +100,6 @@ config PM_SLEEP_SMP
depends on SMP
depends on ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE
depends on PM_SLEEP
- select HOTPLUG
select HOTPLUG_CPU
config PM_AUTOSLEEP