Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / fs / ocfs2 / Kconfig

diff --git a/fs/ocfs2/Kconfig b/fs/ocfs2/Kconfig
index 0d840669698ea7584c5eb860a1430206e76712c1..77a8de5f7119f14e91cb506519b95561b3230ed3 100644 (file)
--- a/fs/ocfs2/Kconfig
+++ b/fs/ocfs2/Kconfig
@@ -1,7 +1,6 @@
 config OCFS2_FS
        tristate "OCFS2 file system support"
-       depends on NET && SYSFS
-       select CONFIGFS_FS
+       depends on NET && SYSFS && CONFIGFS_FS
        select JBD2
        select CRC32
        select QUOTA
@@ -51,7 +50,7 @@ config OCFS2_FS_USERSPACE_CLUSTER
 
 config OCFS2_FS_STATS
        bool "OCFS2 statistics"
-       depends on OCFS2_FS
+       depends on OCFS2_FS && DEBUG_FS
        default y
        help
          This option allows some fs statistics to be captured. Enabling