diff --git a/[refs] b/[refs] index cfcda4637a63..dfb483874059 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d073e9b541e1ac3f52d72c3a153855d9a9ee3278 +refs/heads/master: e3da87066f950076fe274b58f0d0adc7d9f9d412 diff --git a/trunk/fs/nfs/Kconfig b/trunk/fs/nfs/Kconfig index 021d2cf6938a..ee86cfcd6c33 100644 --- a/trunk/fs/nfs/Kconfig +++ b/trunk/fs/nfs/Kconfig @@ -64,6 +64,7 @@ config NFS_V4 bool "NFS client support for NFS version 4" depends on NFS_FS select SUNRPC_GSS + select KEYS help This option enables support for version 4 of the NFS protocol (RFC 3530) in the kernel's NFS client. @@ -130,5 +131,4 @@ config NFS_USE_KERNEL_DNS bool depends on NFS_V4 && !NFS_USE_LEGACY_DNS select DNS_RESOLVER - select KEYS default y