From 734bf4a9f84620b4bcd4a6d9a1c5ae8d3b4b898c Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Sun, 12 Sep 2010 19:57:50 -0400
Subject: [PATCH] --- yaml --- r: 210673 b: refs/heads/master c:
 827e3457022d0bb0b1bb8a0eb88501876fe7dcf0 h: refs/heads/master i:   210671:
 46a2ed1814ad6d9a3cc5c2958ff23edb37149963 v: v3

---
 [refs]                | 2 +-
 trunk/fs/nfs/Kconfig  | 1 +
 trunk/fs/nfsd/Kconfig | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 830fdaefb2d0..23a087655bce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fbf3fdd2443965d9ba6fb4b5fecd1f6e0847218f
+refs/heads/master: 827e3457022d0bb0b1bb8a0eb88501876fe7dcf0
diff --git a/trunk/fs/nfs/Kconfig b/trunk/fs/nfs/Kconfig
index 6c2aad49d731..f7e13db613cb 100644
--- a/trunk/fs/nfs/Kconfig
+++ b/trunk/fs/nfs/Kconfig
@@ -63,6 +63,7 @@ config NFS_V3_ACL
 config NFS_V4
 	bool "NFS client support for NFS version 4"
 	depends on NFS_FS
+	select SUNRPC_GSS
 	help
 	  This option enables support for version 4 of the NFS protocol
 	  (RFC 3530) in the kernel's NFS client.
diff --git a/trunk/fs/nfsd/Kconfig b/trunk/fs/nfsd/Kconfig
index 95932f523aef..4264377552e2 100644
--- a/trunk/fs/nfsd/Kconfig
+++ b/trunk/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).