diff options
author | Benjamin Poirier <bpoirier@suse.de> | 2012-03-23 18:06:18 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2012-03-26 09:18:02 +0100 |
commit | 97cc008aaa8c1f02699b478ca890e81810244131 (patch) | |
tree | 2eeb3e74fe584a9bf3fb186fc4b5e3f63b87d3aa | |
parent | c1ac539ed43f273cd4d92bf7350ffd783b920184 (diff) | |
download | linux-stable-97cc008aaa8c1f02699b478ca890e81810244131.tar.gz linux-stable-97cc008aaa8c1f02699b478ca890e81810244131.tar.bz2 linux-stable-97cc008aaa8c1f02699b478ca890e81810244131.zip |
GFS2: use depends instead of select in kconfig
Avoids having to duplicate the dependencies of what is 'select'ed (and on
down...)
Those dependencies are currently incomplete, leading to broken builds with
GFS2_FS_LOCKING_DLM=y and IP_SCTP=n.
Signed-off-by: Benjamin Poirier <bpoirier@suse.de>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
-rw-r--r-- | fs/gfs2/Kconfig | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/gfs2/Kconfig b/fs/gfs2/Kconfig index c465ae066c62..eb08c9e43c2a 100644 --- a/fs/gfs2/Kconfig +++ b/fs/gfs2/Kconfig @@ -1,10 +1,6 @@ config GFS2_FS tristate "GFS2 file system support" depends on (64BIT || LBDAF) - select DLM if GFS2_FS_LOCKING_DLM - select CONFIGFS_FS if GFS2_FS_LOCKING_DLM - select SYSFS if GFS2_FS_LOCKING_DLM - select IP_SCTP if DLM_SCTP select FS_POSIX_ACL select CRC32 select QUOTACTL @@ -29,7 +25,8 @@ config GFS2_FS config GFS2_FS_LOCKING_DLM bool "GFS2 DLM locking" - depends on (GFS2_FS!=n) && NET && INET && (IPV6 || IPV6=n) && HOTPLUG + depends on (GFS2_FS!=n) && NET && INET && (IPV6 || IPV6=n) && \ + HOTPLUG && DLM && CONFIGFS_FS && SYSFS help Multiple node locking module for GFS2 |