Pull now into release branch

[pandora-kernel.git] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index 6a64990..f9eed6d 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -441,9 +441,6 @@ config OCFS2_FS
 
          Note: Features which OCFS2 does not support yet:
                  - extended attributes
-                 - shared writeable mmap
-                 - loopback is supported, but data written will not
-                   be cluster coherent.
                  - quotas
                  - cluster aware flock
                  - Directory change notification (F_NOTIFY)
@@ -1674,7 +1671,7 @@ config NFSD_V3_ACL
 
 config NFSD_V4
        bool "Provide NFSv4 server support (EXPERIMENTAL)"
-       depends on NFSD_V3 && EXPERIMENTAL
+       depends on NFSD && NFSD_V3 && EXPERIMENTAL
        select RPCSEC_GSS_KRB5
        help
          If you would like to include the NFSv4 server as well as the NFSv2