summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2007-07-07 06:14:02 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-07 14:17:43 -0700
commit95511ad4342cd094e62c807f6631b9a19cc6b129 (patch)
tree560bfd2f278e7bd9b67134662750523a2e5171cd
parent38377be88ab878f44c687dbd704d4d044b000c97 (diff)
downloadlinux-95511ad4342cd094e62c807f6631b9a19cc6b129.tar.gz
linux-95511ad4342cd094e62c807f6631b9a19cc6b129.tar.bz2
linux-95511ad4342cd094e62c807f6631b9a19cc6b129.zip
DLM must depend on SYSFS
The dependency of DLM on SYSFS got lost in commit 6ed7257b46709e87d79ac2b6b819b7e0c9184998 resulting in the following compile error with CONFIG_DLM=y, CONFIG_SYSFS=n: <-- snip --> ... LD .tmp_vmlinux1 fs/built-in.o: In function `dlm_lockspace_init': /home/bunk/linux/kernel-2.6/linux-2.6.22-rc6-mm1/fs/dlm/lockspace.c:231: undefined reference to `kernel_subsys' fs/built-in.o: In function `configfs_init': /home/bunk/linux/kernel-2.6/linux-2.6.22-rc6-mm1/fs/configfs/mount.c:143: undefined reference to `kernel_subsys' make[1]: *** [.tmp_vmlinux1] Error 1 <-- snip --> Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--fs/dlm/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dlm/Kconfig b/fs/dlm/Kconfig
index 69a94690e493..54bcc00ec8df 100644
--- a/fs/dlm/Kconfig
+++ b/fs/dlm/Kconfig
@@ -3,7 +3,7 @@ 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 IP_SCTP
help