From 07e6fee62c9e67089acf2213e97c22980e73d3a1 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Sun, 2 Jan 2011 14:44:00 -0800
Subject: [PATCH] --- yaml --- r: 231655 b: refs/heads/master c:
 16ebe911eba8afa88879213dc4388f2dd701561e h: refs/heads/master i:   231653:
 86bff26abe1e5a3d52d0c46122e28432652b01bb   231651:
 accd331435aa3631f31b74aa75b683b523b824d4   231647:
 a766b3937d3bcd7667b0b41e25b33ae051d168b1 v: v3

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

diff --git a/[refs] b/[refs]
index 08bf20a70b05..0c20ef531594 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3bc0ba4305fa99b32caac8c60df84a2f14fce228
+refs/heads/master: 16ebe911eba8afa88879213dc4388f2dd701561e
diff --git a/trunk/fs/Kconfig b/trunk/fs/Kconfig
index 771f457402d4..9a7921ae4763 100644
--- a/trunk/fs/Kconfig
+++ b/trunk/fs/Kconfig
@@ -30,15 +30,6 @@ config FS_MBCACHE
 source "fs/reiserfs/Kconfig"
 source "fs/jfs/Kconfig"
 
-config FS_POSIX_ACL
-# Posix ACL utility routines (for now, only ext2/ext3/jfs/reiserfs/nfs4)
-#
-# NOTE: you can implement Posix ACLs without these helpers (XFS does).
-# 	Never use this symbol for ifdefs.
-#
-	bool
-	default n
-
 source "fs/xfs/Kconfig"
 source "fs/gfs2/Kconfig"
 source "fs/ocfs2/Kconfig"
@@ -47,6 +38,14 @@ source "fs/nilfs2/Kconfig"
 
 endif # BLOCK
 
+# Posix ACL utility routines
+#
+# Note: Posix ACLs can be implemented without these helpers.  Never use
+# this symbol for ifdefs in core code.
+#
+config FS_POSIX_ACL
+	def_bool n
+
 config EXPORTFS
 	tristate