diff --git a/[refs] b/[refs] index 63a45322aed2..6dc058577073 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f5c54804d9e3bb23d8924af09d9ca1c8de9560b6 +refs/heads/master: 1ee48af22ed6dcddea8cdf93c7f2a268cbcf0d56 diff --git a/trunk/fs/dlm/Kconfig b/trunk/fs/dlm/Kconfig index 490f85b3fa59..81b2c6465eeb 100644 --- a/trunk/fs/dlm/Kconfig +++ b/trunk/fs/dlm/Kconfig @@ -1,10 +1,9 @@ menu "Distributed Lock Manager" - depends on INET && EXPERIMENTAL + depends on INET && IP_SCTP && EXPERIMENTAL config DLM tristate "Distributed Lock Manager (DLM)" depends on IPV6 || IPV6=n - depends on IP_SCTP select CONFIGFS_FS help A general purpose distributed lock manager for kernel or userspace