summaryrefslogtreecommitdiffstats
path: root/security/integrity/ima/ima_init.c
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2016-02-26 15:06:41 +1100
committerJames Morris <james.l.morris@oracle.com>2016-02-26 15:06:41 +1100
commit481873d06f2bf2ad732450a3a5fa5b8c2a07ef88 (patch)
treee2d16457d7902795073e4e4ad479798242a0ef80 /security/integrity/ima/ima_init.c
parent602094428090ea17321afcb5edc572544b7ee368 (diff)
parent95ee08fa373b9ede1059c2f384cfeafe10dcd6bb (diff)
downloadlinux-481873d06f2bf2ad732450a3a5fa5b8c2a07ef88.tar.bz2
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_init.c')
-rw-r--r--security/integrity/ima/ima_init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/integrity/ima/ima_init.c b/security/integrity/ima/ima_init.c
index bd79f254d204..5d679a685616 100644
--- a/security/integrity/ima/ima_init.c
+++ b/security/integrity/ima/ima_init.c
@@ -21,7 +21,7 @@
#include <linux/scatterlist.h>
#include <linux/slab.h>
#include <linux/err.h>
-#include <crypto/hash_info.h>
+
#include "ima.h"
/* name for boot aggregate entry */