Merge mainline/master into arm/fixes

[linux.git] / security / apparmor / Kconfig

diff --git a/security/apparmor/Kconfig b/security/apparmor/Kconfig
index d8b1a360a6368cca12f534c6057d584d54617f26..a422a349f92643dcb8c81cd07ded82c66d3c72e9 100644 (file)
--- a/security/apparmor/Kconfig
+++ b/security/apparmor/Kconfig
@@ -6,6 +6,8 @@ config SECURITY_APPARMOR
        select SECURITY_PATH
        select SECURITYFS
        select SECURITY_NETWORK
+       select ZLIB_INFLATE
+       select ZLIB_DEFLATE
        default n
        help
          This enables the AppArmor security module.