diff --git a/[refs] b/[refs] index 4771b10cfaf1..ab6dd908057b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f90a8b1b87f97144911790390d56f695b59db9b +refs/heads/master: b98c95af01c10827e3443157651eb469071391a3 diff --git a/trunk/fs/dlm/Kconfig b/trunk/fs/dlm/Kconfig index c5985b883b2c..b5654a284fef 100644 --- a/trunk/fs/dlm/Kconfig +++ b/trunk/fs/dlm/Kconfig @@ -1,10 +1,11 @@ menu "Distributed Lock Manager" - depends on INET && IP_SCTP && EXPERIMENTAL + depends on EXPERIMENTAL && INET config DLM tristate "Distributed Lock Manager (DLM)" depends on IPV6 || IPV6=n select CONFIGFS_FS + select IP_SCTP if DLM_SCTP help A general purpose distributed lock manager for kernel or userspace applications.