diff options
author | James Morris <james.l.morris@oracle.com> | 2016-02-26 15:06:41 +1100 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2016-02-26 15:06:41 +1100 |
commit | 481873d06f2bf2ad732450a3a5fa5b8c2a07ef88 (patch) | |
tree | e2d16457d7902795073e4e4ad479798242a0ef80 /security/integrity/ima/ima_template.c | |
parent | Merge branch 'smack-for-4.6' of https://github.com/cschaufler/smack-next into next (diff) | |
parent | ima: require signed IMA policy (diff) | |
download | linux-dev-481873d06f2bf2ad732450a3a5fa5b8c2a07ef88.tar.xz linux-dev-481873d06f2bf2ad732450a3a5fa5b8c2a07ef88.zip |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next
Diffstat (limited to 'security/integrity/ima/ima_template.c')
-rw-r--r-- | security/integrity/ima/ima_template.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/security/integrity/ima/ima_template.c b/security/integrity/ima/ima_template.c index 0b7404ebfa80..febd12ed9b55 100644 --- a/security/integrity/ima/ima_template.c +++ b/security/integrity/ima/ima_template.c @@ -15,8 +15,6 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt -#include <crypto/hash_info.h> - #include "ima.h" #include "ima_template_lib.h" |