---

yaml --- r: 92817 b: refs/heads/master c: 78dd099 h: refs/heads/master i: 92815: 04db4be v: v3
git-mirror · Apr 23, 2008 · b2d7a1e · b2d7a1e
1 parent 09ba8ce
commit b2d7a1e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 892069552eedfa0d2fca41680d076a5bc0a3c26e
+refs/heads/master: 78dd0992a3462e05138cf4d08df759bf1c7a08c9
diff --git a/trunk/fs/Kconfig b/trunk/fs/Kconfig
@@ -1694,7 +1694,6 @@ config NFSD
 	select LOCKD
 	select SUNRPC
 	select EXPORTFS
-	select NFSD_V2_ACL if NFSD_V3_ACL
 	select NFS_ACL_SUPPORT if NFSD_V2_ACL
 	select CRYPTO_MD5 if NFSD_V4
 	select CRYPTO if NFSD_V4
@@ -1738,6 +1737,7 @@ config NFSD_V3
 config NFSD_V3_ACL
 	bool "NFS server support for the NFSv3 ACL protocol extension"
 	depends on NFSD_V3
+	select NFSD_V2_ACL
 	help
 	  Solaris NFS servers support an auxiliary NFSv3 ACL protocol that
 	  never became an official part of the NFS version 3 protocol.