diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /fs/dlm/Kconfig | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'fs/dlm/Kconfig')
| -rw-r--r-- | fs/dlm/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/dlm/Kconfig b/fs/dlm/Kconfig index 2dbb422e8116..1897eb1b4b6a 100644 --- a/fs/dlm/Kconfig +++ b/fs/dlm/Kconfig | |||
| @@ -1,8 +1,7 @@ | |||
| 1 | menuconfig DLM | 1 | menuconfig DLM |
| 2 | tristate "Distributed Lock Manager (DLM)" | 2 | tristate "Distributed Lock Manager (DLM)" |
| 3 | depends on EXPERIMENTAL && INET | 3 | depends on EXPERIMENTAL && INET |
| 4 | depends on SYSFS && (IPV6 || IPV6=n) | 4 | depends on SYSFS && CONFIGFS_FS && (IPV6 || IPV6=n) |
| 5 | select CONFIGFS_FS | ||
| 6 | select IP_SCTP | 5 | select IP_SCTP |
| 7 | help | 6 | help |
| 8 | A general purpose distributed lock manager for kernel or userspace | 7 | A general purpose distributed lock manager for kernel or userspace |