diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-05-21 13:49:35 +1000 |
---|---|---|
committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-18 11:48:05 +0900 |
commit | a5dc3531e00a6d3bf17d553dde3560557b2f46bc (patch) | |
tree | 01ccbe49794b0f7f4bfb34d6668b653de261c0d1 /fs | |
parent | decaed22ba309765ff9e7229d8df5c6c45504067 (diff) | |
download | linux-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 'fs')
-rw-r--r-- | fs/gfs2/Kconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/gfs2/Kconfig b/fs/gfs2/Kconfig index 5a376ab81fe..90c6a8faaec 100644 --- a/fs/gfs2/Kconfig +++ b/fs/gfs2/Kconfig @@ -20,13 +20,12 @@ config GFS2_FS be found here: http://sources.redhat.com/cluster The "nolock" lock module is now built in to GFS2 by default. If - you want to use the DLM, be sure to enable HOTPLUG and IPv4/6 - networking. + you want to use the DLM, be sure to enable IPv4/6 networking. config GFS2_FS_LOCKING_DLM bool "GFS2 DLM locking" depends on (GFS2_FS!=n) && NET && INET && (IPV6 || IPV6=n) && \ - HOTPLUG && CONFIGFS_FS && SYSFS && (DLM=y || DLM=GFS2_FS) + CONFIGFS_FS && SYSFS && (DLM=y || DLM=GFS2_FS) help Multiple node locking module for GFS2 |