Merge branch 'master' into tk71

[mv-sheeva.git] / fs / 9p / Kconfig

diff --git a/fs/9p/Kconfig b/fs/9p/Kconfig
index 795233702a4ee07e9db56c8939a06691be7ae665..814ac4e213a8a2c37873f99a68a7d639d575e6cf 100644 (file)
--- a/fs/9p/Kconfig
+++ b/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
@@ -17,3 +19,17 @@ config 9P_FSCACHE
          Choose Y here to enable persistent, read-only local
          caching support for 9p clients using FS-Cache
 
+
+config 9P_FS_POSIX_ACL
+       bool "9P POSIX Access Control Lists"
+       select FS_POSIX_ACL
+       help
+         POSIX Access Control Lists (ACLs) support permissions for users and
+         groups beyond the owner/group/world scheme.
+
+         To learn more about Access Control Lists, visit the POSIX ACLs for
+         Linux website <http://acl.bestbits.at/>.
+
+         If you don't know what Access Control Lists are, say N
+
+endif