From a61075cbdf9de74d28799bce4416686300a623b6 Mon Sep 17 00:00:00 2001 From: Mimi Zohar Date: Tue, 4 May 2010 18:16:30 -0400 Subject: [PATCH] --- yaml --- r: 192438 b: refs/heads/master c: a674fa46c79ffa37995bd1c8e4daa2b3be5a95ae h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/security/integrity/ima/Kconfig | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8e334a26dbc0..be101dc4ba4a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b89e66e1e396f7b5436af154e58209320cc08aed +refs/heads/master: a674fa46c79ffa37995bd1c8e4daa2b3be5a95ae diff --git a/trunk/security/integrity/ima/Kconfig b/trunk/security/integrity/ima/Kconfig index 3d7846de8069..b6ecfd4d8d78 100644 --- a/trunk/security/integrity/ima/Kconfig +++ b/trunk/security/integrity/ima/Kconfig @@ -2,15 +2,14 @@ # config IMA bool "Integrity Measurement Architecture(IMA)" - depends on ACPI depends on SECURITY select SECURITYFS select CRYPTO select CRYPTO_HMAC select CRYPTO_MD5 select CRYPTO_SHA1 - select TCG_TPM - select TCG_TIS + select TCG_TPM if !S390 + select TCG_TIS if TCG_TPM help The Trusted Computing Group(TCG) runtime Integrity Measurement Architecture(IMA) maintains a list of hash