diff --git a/[refs] b/[refs] index d1f7d1a159ce..c3501fbec1fd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 957df4535d06a8e009101239937ca5e50a6218c6 +refs/heads/master: 243e2dd38e1b322b29a1714034cc60b84d3d5e07 diff --git a/trunk/fs/cifs/Kconfig b/trunk/fs/cifs/Kconfig index 66c68ab9e7df..53ed1ad2c112 100644 --- a/trunk/fs/cifs/Kconfig +++ b/trunk/fs/cifs/Kconfig @@ -149,7 +149,7 @@ config CIFS_FSCACHE config CIFS_ACL bool "Provide CIFS ACL support (EXPERIMENTAL)" - depends on EXPERIMENTAL && CIFS_XATTR + depends on EXPERIMENTAL && CIFS_XATTR && KEYS help Allows to fetch CIFS/NTFS ACL from the server. The DACL blob is handed over to the application/caller.