Merge tag 'mvebu-irqchip-3.14' of git://git.infradead.org/linux-mvebu into irq/core

[deliverable/linux.git] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index c229f828eb012ea32a13c306cf1953ae85e3ca2a..7385e54be4b9adbdd8a4c2d0ed3cafd3b516820a 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -68,10 +68,6 @@ source "fs/quota/Kconfig"
 source "fs/autofs4/Kconfig"
 source "fs/fuse/Kconfig"
 
-config GENERIC_ACL
-       bool
-       select FS_POSIX_ACL
-
 menu "Caches"
 
 source "fs/fscache/Kconfig"
@@ -119,7 +115,7 @@ config TMPFS_POSIX_ACL
        bool "Tmpfs POSIX Access Control Lists"
        depends on TMPFS
        select TMPFS_XATTR
-       select GENERIC_ACL
+       select FS_POSIX_ACL
        help
          POSIX Access Control Lists (ACLs) support additional access rights
          for users and groups beyond the standard owner/group/world scheme,