Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into next

diff --git a/security/apparmor/Kconfig b/security/apparmor/Kconfig
index d49c53960b60c5010d314022d3e58d255ffac204..232469baa94f2f17e686f2cf702a56424eda8176 100644 (file)
--- a/security/apparmor/Kconfig
+++ b/security/apparmor/Kconfig
@@ -33,7 +33,7 @@ config SECURITY_APPARMOR_BOOTPARAM_VALUE
 config SECURITY_APPARMOR_HASH
        bool "SHA1 hash of loaded profiles"
        depends on SECURITY_APPARMOR
-       depends on CRYPTO
+       select CRYPTO
        select CRYPTO_SHA1
        default y