From cdfaf85331ac1a1917033e4afc6d393bd7dc89c4 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Sun, 28 Jan 2007 17:19:50 +0100 Subject: [PATCH] --- yaml --- r: 46315 b: refs/heads/master c: 001172778543c6997d3339f43085e43460e5883a h: refs/heads/master i: 46313: a4b9b39be716f26a03659803e9a77583e4d82689 46311: 5f7c5d9a90badfba11892663fae22a4835b896bf v: v3 --- [refs] | 2 +- trunk/fs/dlm/Kconfig | 3 +-- trunk/fs/gfs2/Kconfig | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b860b3d8de67..21f40b8bcb69 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 67f55897ee5ffa16ca00ed39d176dc52b5066679 +refs/heads/master: 001172778543c6997d3339f43085e43460e5883a diff --git a/trunk/fs/dlm/Kconfig b/trunk/fs/dlm/Kconfig index d1359b91410a..7e264b72e0c5 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 IPV6 || IPV6=n + depends on SYSFS && (IPV6 || IPV6=n) select CONFIGFS_FS - select SYSFS select IP_SCTP if DLM_SCTP help A general purpose distributed lock manager for kernel or userspace diff --git a/trunk/fs/gfs2/Kconfig b/trunk/fs/gfs2/Kconfig index 2c184a97cb12..cbd5f3319321 100644 --- a/trunk/fs/gfs2/Kconfig +++ b/trunk/fs/gfs2/Kconfig @@ -34,11 +34,10 @@ config GFS2_FS_LOCKING_NOLOCK config GFS2_FS_LOCKING_DLM tristate "GFS2 DLM locking module" - depends on GFS2_FS && NET && INET && (IPV6 || IPV6=n) + depends on GFS2_FS && SYSFS && NET && INET && (IPV6 || IPV6=n) select IP_SCTP if DLM_SCTP select CONFIGFS_FS select DLM - select SYSFS help Multiple node locking module for GFS2