[GFS2] Fix up merge of Linus' kernel into GFS2

[pandora-kernel.git] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index a7cd7db..ca9affd 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -326,8 +326,8 @@ source "fs/xfs/Kconfig"
 source "fs/gfs2/Kconfig"
 
 config OCFS2_FS
-       tristate "OCFS2 file system support (EXPERIMENTAL)"
-       depends on NET && SYSFS && EXPERIMENTAL
+       tristate "OCFS2 file system support"
+       depends on NET && SYSFS
        select CONFIGFS_FS
        select JBD
        select CRC32
@@ -1472,8 +1472,8 @@ config NFS_V4
          If unsure, say N.
 
 config NFS_DIRECTIO
-       bool "Allow direct I/O on NFS files (EXPERIMENTAL)"
-       depends on NFS_FS && EXPERIMENTAL
+       bool "Allow direct I/O on NFS files"
+       depends on NFS_FS
        help
          This option enables applications to perform uncached I/O on files
          in NFS file systems using the O_DIRECT open() flag.  When O_DIRECT
@@ -1802,6 +1802,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