Merge branch 'master' into upstream-fixes

[linux-2.6] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index be870db242b368b3a49c9d25f10b300be7968851..3f00a9faabcb6314e2ddfb6fd56b013d95059436 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -326,7 +326,7 @@ source "fs/xfs/Kconfig"
 
 config OCFS2_FS
        tristate "OCFS2 file system support (EXPERIMENTAL)"
-       depends on NET && EXPERIMENTAL
+       depends on NET && SYSFS && EXPERIMENTAL
        select CONFIGFS_FS
        select JBD
        select CRC32
@@ -1801,6 +1801,7 @@ config CIFS_POSIX
 
 config CIFS_DEBUG2
        bool "Enable additional CIFS debugging routines"
+       depends on CIFS
        help
           Enabling this option adds a few more debugging routines
           to the cifs code which slightly increases the size of