diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-12-16 02:49:10 +0100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-12-16 02:49:10 +0100 |
| commit | d0bffab0439fb7edaee09677b636eef5991e8b80 (patch) | |
| tree | 4437686bf7e9bea8f6444f23850f21a7b9f360a7 /security/integrity | |
| parent | Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux (diff) | |
| parent | ima: Fix build failure on powerpc when TCG_IBMVTPM dependencies are not met (diff) | |
| download | linux-d0bffab0439fb7edaee09677b636eef5991e8b80.tar.xz linux-d0bffab0439fb7edaee09677b636eef5991e8b80.zip | |
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/Kconfig | 2 |
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 select CRYPTO_HASH_INFO select TCG_TPM if HAS_IOMEM && !UML select TCG_TIS if TCG_TPM && X86 - select TCG_IBMVTPM if TCG_TPM && PPC64 + select TCG_IBMVTPM if TCG_TPM && PPC_PSERIES help The Trusted Computing Group(TCG) runtime Integrity Measurement Architecture(IMA) maintains a list of hash |