diff --git a/[refs] b/[refs]
index b0dd394d0227..03656a2459ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f81c1157468dd0a7377249c44ae83a7fe998bc9
+refs/heads/master: 255614c45943d43a3778a04b214692346b9d5049
diff --git a/trunk/fs/9p/Kconfig b/trunk/fs/9p/Kconfig
index 7e0511476797..814ac4e213a8 100644
--- a/trunk/fs/9p/Kconfig
+++ b/trunk/fs/9p/Kconfig
@@ -9,6 +9,8 @@ config 9P_FS
 
 	  If unsure, say N.
 
+if 9P_FS
+
 config 9P_FSCACHE
 	bool "Enable 9P client caching support (EXPERIMENTAL)"
 	depends on EXPERIMENTAL
@@ -20,7 +22,6 @@ config 9P_FSCACHE
 
 config 9P_FS_POSIX_ACL
 	bool "9P POSIX Access Control Lists"
-	depends on 9P_FS
 	select FS_POSIX_ACL
 	help
 	  POSIX Access Control Lists (ACLs) support permissions for users and
@@ -30,3 +31,5 @@ config 9P_FS_POSIX_ACL
 	  Linux website <http://acl.bestbits.at/>.
 
 	  If you don't know what Access Control Lists are, say N
+
+endif