summaryrefslogtreecommitdiff
path: root/fs/nfs/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-19 02:45:23 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-19 02:45:23 +0400
commit763008c4357b73c8d18396dfd8d79dc58fa3f99d (patch)
tree818add523a6b81b560bebac727c57c6a8ea6fd63 /fs/nfs/Kconfig
parentd1126ad907ce197ff45fbc2369fbeaf8ae6f75a8 (diff)
parent0a377cff9428af2da2b293d11e07bc4dbf064ee5 (diff)
downloadlinux-763008c4357b73c8d18396dfd8d79dc58fa3f99d.tar.xz
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: NFS: Fix an Oops in the NFSv4 atomic open code NFS: Fix the selection of security flavours in Kconfig NFS: fix the return value of nfs_file_fsync() rpcrdma: Fix SQ size calculation when memreg is FRMR xprtrdma: Do not truncate iova_start values in frmr registrations. nfs: Remove redundant NULL check upon kfree() nfs: Add "lookupcache" to displayed mount options NFS: allow close-to-open cache semantics to apply to root of NFS filesystem SUNRPC: fix NFS client over TCP hangs due to packet loss (Bug 16494)
Diffstat (limited to 'fs/nfs/Kconfig')
-rw-r--r--fs/nfs/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig
index 26a510a7be09..6c2aad49d731 100644
--- a/fs/nfs/Kconfig
+++ b/fs/nfs/Kconfig
@@ -63,7 +63,6 @@ config NFS_V3_ACL
config NFS_V4
bool "NFS client support for NFS version 4"
depends on NFS_FS
- select RPCSEC_GSS_KRB5
help
This option enables support for version 4 of the NFS protocol
(RFC 3530) in the kernel's NFS client.