aboutsummaryrefslogtreecommitdiffstats
path: root/security/integrity
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2014-12-15 20:49:10 -0500
committerJames Morris <james.l.morris@oracle.com>2014-12-15 20:49:10 -0500
commitd0bffab0439fb7edaee09677b636eef5991e8b80 (patch)
tree4437686bf7e9bea8f6444f23850f21a7b9f360a7 /security/integrity
parent988adfdffdd43cfd841df734664727993076d7cb (diff)
parent63a0eb7891bdf3ef32ecb6b01eb09106df646c10 (diff)
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into for-linus
Diffstat (limited to 'security/integrity')
-rw-r--r--security/integrity/ima/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/integrity/ima/Kconfig b/security/integrity/ima/Kconfig
index b80a93ec1ccc..57515bc915c0 100644
--- a/security/integrity/ima/Kconfig
+++ b/security/integrity/ima/Kconfig
@@ -10,7 +10,7 @@ config IMA
10 select CRYPTO_HASH_INFO 10 select CRYPTO_HASH_INFO
11 select TCG_TPM if HAS_IOMEM && !UML 11 select TCG_TPM if HAS_IOMEM && !UML
12 select TCG_TIS if TCG_TPM && X86 12 select TCG_TIS if TCG_TPM && X86
13 select TCG_IBMVTPM if TCG_TPM && PPC64 13 select TCG_IBMVTPM if TCG_TPM && PPC_PSERIES
14 help 14 help
15 The Trusted Computing Group(TCG) runtime Integrity 15 The Trusted Computing Group(TCG) runtime Integrity
16 Measurement Architecture(IMA) maintains a list of hash 16 Measurement Architecture(IMA) maintains a list of hash