Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 97cc008aaa8c1f02699b478ca890e81810244131

Authored by Benjamin Poirier
Committed by Steven Whitehouse
1 parent c1ac539ed4
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 1 changed file with 2 additions and 5 deletions Side-by-side Diff

1 1 config GFS2_FS
2 2 tristate "GFS2 file system support"
3 3 depends on (64BIT || LBDAF)
4   - select DLM if GFS2_FS_LOCKING_DLM
5   - select CONFIGFS_FS if GFS2_FS_LOCKING_DLM
6   - select SYSFS if GFS2_FS_LOCKING_DLM
7   - select IP_SCTP if DLM_SCTP
8 4 select FS_POSIX_ACL
9 5 select CRC32
10 6 select QUOTACTL
... ... @@ -29,7 +25,8 @@
29 25  
30 26 config GFS2_FS_LOCKING_DLM
31 27 bool "GFS2 DLM locking"
32   - depends on (GFS2_FS!=n) && NET && INET && (IPV6 || IPV6=n) && HOTPLUG
  28 + depends on (GFS2_FS!=n) && NET && INET && (IPV6 || IPV6=n) && \
  29 + HOTPLUG && DLM && CONFIGFS_FS && SYSFS
33 30 help
34 31 Multiple node locking module for GFS2
35 32