Merge branch 'u300' into devel

[~andy/linux] / fs / nfs / Kconfig

diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig
index e67f3ec0773681c17dcf906e0cddfbd12d9ea1bc..2a77bc25d5afc81d9510c9f1825d842deb727b80 100644 (file)
--- a/fs/nfs/Kconfig
+++ b/fs/nfs/Kconfig
@@ -1,6 +1,6 @@
 config NFS_FS
        tristate "NFS client support"
-       depends on INET
+       depends on INET && FILE_LOCKING
        select LOCKD
        select SUNRPC
        select NFS_ACL_SUPPORT if NFS_V3_ACL
@@ -74,6 +74,15 @@ config NFS_V4
 
          If unsure, say N.
 
+config NFS_V4_1
+       bool "NFS client support for NFSv4.1 (DEVELOPER ONLY)"
+       depends on NFS_V4 && EXPERIMENTAL
+       help
+         This option enables support for minor version 1 of the NFSv4 protocol
+         (draft-ietf-nfsv4-minorversion1) in the kernel's NFS client.
+
+         Unless you're an NFS developer, say N.
+
 config ROOT_NFS
        bool "Root file system on NFS"
        depends on NFS_FS=y && IP_PNP