diff --git a/[refs] b/[refs] index 75bd585e749b..9c828a0e052f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9f9ab51e55e36379773752ffeaac677b080d469 +refs/heads/master: 86c747d2a4f028fe2fdf091c3a81d0e187827682 diff --git a/trunk/fs/dlm/Kconfig b/trunk/fs/dlm/Kconfig index 2dbb422e8116..1897eb1b4b6a 100644 --- a/trunk/fs/dlm/Kconfig +++ b/trunk/fs/dlm/Kconfig @@ -1,8 +1,7 @@ menuconfig DLM tristate "Distributed Lock Manager (DLM)" depends on EXPERIMENTAL && INET - depends on SYSFS && (IPV6 || IPV6=n) - select CONFIGFS_FS + depends on SYSFS && CONFIGFS_FS && (IPV6 || IPV6=n) select IP_SCTP help A general purpose distributed lock manager for kernel or userspace