aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/Kconfig
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2013-05-20 23:49:35 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-03 17:20:18 -0400
commit40b313608ad4ea655addd2ec6cdd106477ae8e15 (patch)
tree371f6ad524c7d85901bc9002ff2960ea10cb5154 /fs/gfs2/Kconfig
parentaf5bc11e9aa19f72a2d5ccd44611cb6268a60a34 (diff)
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/gfs2/Kconfig')
-rw-r--r--fs/gfs2/Kconfig5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/gfs2/Kconfig b/fs/gfs2/Kconfig
index 5a376ab81feb..90c6a8faaecb 100644
--- a/fs/gfs2/Kconfig
+++ b/fs/gfs2/Kconfig
@@ -20,13 +20,12 @@ config GFS2_FS
20 be found here: http://sources.redhat.com/cluster 20 be found here: http://sources.redhat.com/cluster
21 21
22 The "nolock" lock module is now built in to GFS2 by default. If 22 The "nolock" lock module is now built in to GFS2 by default. If
23 you want to use the DLM, be sure to enable HOTPLUG and IPv4/6 23 you want to use the DLM, be sure to enable IPv4/6 networking.
24 networking.
25 24
26config GFS2_FS_LOCKING_DLM 25config GFS2_FS_LOCKING_DLM
27 bool "GFS2 DLM locking" 26 bool "GFS2 DLM locking"
28 depends on (GFS2_FS!=n) && NET && INET && (IPV6 || IPV6=n) && \ 27 depends on (GFS2_FS!=n) && NET && INET && (IPV6 || IPV6=n) && \
29 HOTPLUG && CONFIGFS_FS && SYSFS && (DLM=y || DLM=GFS2_FS) 28 CONFIGFS_FS && SYSFS && (DLM=y || DLM=GFS2_FS)
30 help 29 help
31 Multiple node locking module for GFS2 30 Multiple node locking module for GFS2
32 31