Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

[net-next-2.6.git] / fs / nfs / Kconfig

diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig
index c5bbdca13ac2952e769b8f900f04c3b1afba6309..6c2aad49d7318054b57c22b58c6b4eaa0be50178 100644 (file)
--- 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.
@@ -115,4 +114,5 @@ config NFS_USE_KERNEL_DNS
        bool
        depends on NFS_V4 && !NFS_USE_LEGACY_DNS
        select DNS_RESOLVER
+       select KEYS
        default y