From e706c0907791d6ce35c4d49b55a946917c0ac225 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Wed, 8 Feb 2012 13:21:38 -0500
Subject: [PATCH] --- yaml --- r: 294479 b: refs/heads/master c:
 e3da87066f950076fe274b58f0d0adc7d9f9d412 h: refs/heads/master i:   294477:
 c8833e2f1169edeb1551f70ee1d021e83b8a8c5c   294475:
 6fe91035b82a540e7ca935f471550e8ab2edfc9b   294471:
 7f0c8b21e5b9c221a93ca813ae68a5236644d114   294463:
 19990dd74efcb46bfeee8c11818a34df902bd24b v: v3

---
 [refs]               | 2 +-
 trunk/fs/nfs/Kconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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