diff --git a/[refs] b/[refs] index b19e18fd72b2..0c42ec129563 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4bcf7091f9da595016f9d1175aa1bea8e736566f +refs/heads/master: 96c2c0083d76ca80d546a53089c86e74fbfbe791 diff --git a/trunk/fs/dlm/Kconfig b/trunk/fs/dlm/Kconfig index d01f735e6e06..09e78bf6e7a4 100644 --- a/trunk/fs/dlm/Kconfig +++ b/trunk/fs/dlm/Kconfig @@ -3,9 +3,8 @@ menu "Distributed Lock Manager" config DLM tristate "Distributed Lock Manager (DLM)" - depends on SYSFS depends on IPV6 || IPV6=n - select IP_SCTP + depends on IP_SCTP select CONFIGFS_FS help A general purpose distributed lock manager for kernel or userspace