From 1ceb000fde8fe679fd1c9999d58d77aa51621dc8 Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@citi.umich.edu>
Date: Tue, 6 Jul 2010 12:39:12 -0400
Subject: [PATCH] --- yaml --- r: 206433 b: refs/heads/master c:
 6a85d6c76962db769bb2f2cb11b17b16f32c4158 h: refs/heads/master i:   206431:
 fdf5c3bf81b8744b1061276b9c075e5a38054c3f v: v3

---
 [refs]              | 2 +-
 trunk/fs/nfsd/vfs.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7913894825eb..f60863e10156 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8eab945c5616fc984e97b922d6a2559be93f39a1
+refs/heads/master: 6a85d6c76962db769bb2f2cb11b17b16f32c4158
diff --git a/trunk/fs/nfsd/vfs.c b/trunk/fs/nfsd/vfs.c
index ebbf3b6b2457..e3611b55531b 100644
--- a/trunk/fs/nfsd/vfs.c
+++ b/trunk/fs/nfsd/vfs.c
@@ -605,7 +605,7 @@ nfsd4_get_nfs4_acl(struct svc_rqst *rqstp, struct dentry *dentry, struct nfs4_ac
 	return error;
 }
 
-#endif /* defined(CONFIG_NFS_V4) */
+#endif /* defined(CONFIG_NFSD_V4) */
 
 #ifdef CONFIG_NFSD_V3
 /*