diff options
author | David S. Miller <davem@davemloft.net> | 2010-10-07 04:11:17 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-10-07 04:11:17 +0200 |
commit | 12e94471b2be5ef9b55b10004a3a2cd819490036 (patch) | |
tree | f84ae818687dc7c35bd54f11bfb9717278d28a4e /fs/nfsd/Kconfig | |
parent | caif: fix two caif_connect() bugs (diff) | |
parent | Linux 2.6.36-rc7 (diff) | |
download | linux-12e94471b2be5ef9b55b10004a3a2cd819490036.tar.xz linux-12e94471b2be5ef9b55b10004a3a2cd819490036.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/nfsd/Kconfig')
-rw-r--r-- | fs/nfsd/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfsd/Kconfig b/fs/nfsd/Kconfig index 95932f523aef..4264377552e2 100644 --- a/fs/nfsd/Kconfig +++ b/fs/nfsd/Kconfig @@ -69,6 +69,7 @@ config NFSD_V4 depends on NFSD && PROC_FS && EXPERIMENTAL select NFSD_V3 select FS_POSIX_ACL + select SUNRPC_GSS help This option enables support in your system's NFS server for version 4 of the NFS protocol (RFC 3530). |