Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into next
authorJames Morris <james.l.morris@oracle.com>
Thu, 22 Oct 2015 00:17:50 +0000 (11:17 +1100)
committerJames Morris <james.l.morris@oracle.com>
Thu, 22 Oct 2015 00:17:50 +0000 (11:17 +1100)
security/apparmor/Kconfig

index d49c539..232469b 100644 (file)
@@ -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