git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'tpmdd-next-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko...
[sfrench/cifs-2.6.git]
/
security
/
keys
/
trusted-keys
/
Makefile
diff --git
a/security/keys/trusted-keys/Makefile
b/security/keys/trusted-keys/Makefile
index 7b73cebbb378a2f2eadffa083ec9d28b44295ee2..feb8b6c3cc79cb6c2235ff90523b1bf5303d09c1 100644
(file)
--- a/
security/keys/trusted-keys/Makefile
+++ b/
security/keys/trusted-keys/Makefile
@@
-4,5
+4,11
@@
#
obj-$(CONFIG_TRUSTED_KEYS) += trusted.o
+trusted-y += trusted_core.o
trusted-y += trusted_tpm1.o
+
+$(obj)/trusted_tpm2.o: $(obj)/tpm2key.asn1.h
trusted-y += trusted_tpm2.o
+trusted-y += tpm2key.asn1.o
+
+trusted-$(CONFIG_TEE) += trusted_tee.o