diff --git a/[refs] b/[refs]
index d8ff6e5a8feb..e39e7c3e1247 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6f8ff7381501887233666b508b9eac70143303d
+refs/heads/master: f2fbc6c2dad7bbcbf226c094749534f1e84d3be2
diff --git a/trunk/fs/Kconfig b/trunk/fs/Kconfig
index 6a3df055280a..fee318e6f4bb 100644
--- a/trunk/fs/Kconfig
+++ b/trunk/fs/Kconfig
@@ -634,6 +634,10 @@ config FUSE_FS
 	  If you want to develop a userspace FS, or if you want to use
 	  a filesystem based on FUSE, answer Y or M.
 
+config GENERIC_ACL
+	bool
+	select FS_POSIX_ACL
+
 if BLOCK
 menu "CD-ROM/DVD Filesystems"
 
@@ -2080,10 +2084,6 @@ config 9P_FS
 
 	  If unsure, say N.
 
-config GENERIC_ACL
-	bool
-	select FS_POSIX_ACL
-
 endmenu
 
 if BLOCK