diff options
author | James Morris <james.l.morris@oracle.com> | 2015-12-26 16:06:53 +1100 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2015-12-26 16:06:53 +1100 |
commit | 3cb92fe48138d225b8d0ceedf148642f9103f841 (patch) | |
tree | cbb877002d9d39777be13df3876e05f2542da234 /security/integrity/ima/Makefile | |
parent | 5beb0c435bdde35a09376566b0e28f7df87c9f68 (diff) | |
parent | 0112721df4edbdd07b800813300d76811572f080 (diff) | |
download | op-kernel-dev-3cb92fe48138d225b8d0ceedf148642f9103f841.zip op-kernel-dev-3cb92fe48138d225b8d0ceedf148642f9103f841.tar.gz |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next
Diffstat (limited to 'security/integrity/ima/Makefile')
-rw-r--r-- | security/integrity/ima/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/security/integrity/ima/Makefile b/security/integrity/ima/Makefile index d79263d..a8539f9 100644 --- a/security/integrity/ima/Makefile +++ b/security/integrity/ima/Makefile @@ -8,3 +8,4 @@ obj-$(CONFIG_IMA) += ima.o ima-y := ima_fs.o ima_queue.o ima_init.o ima_main.o ima_crypto.o ima_api.o \ ima_policy.o ima_template.o ima_template_lib.o ima-$(CONFIG_IMA_APPRAISE) += ima_appraise.o +obj-$(CONFIG_IMA_MOK_KEYRING) += ima_mok.o |