From 83c36ccfe4d849f482ea0a62402c7624f4e59f0e Mon Sep 17 00:00:00 2001 From: James Morris Date: Fri, 7 May 2010 09:20:03 +1000 Subject: Revert "ima: remove ACPI dependency" This reverts commit a674fa46c79ffa37995bd1c8e4daa2b3be5a95ae. Previous revert was a prereq. Signed-off-by: James Morris --- security/integrity/ima/Kconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/security/integrity/ima/Kconfig b/security/integrity/ima/Kconfig index b6ecfd4d8d78..3d7846de8069 100644 --- a/security/integrity/ima/Kconfig +++ b/security/integrity/ima/Kconfig @@ -2,14 +2,15 @@ # 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 if !S390 - select TCG_TIS if TCG_TPM + select TCG_TPM + select TCG_TIS help The Trusted Computing Group(TCG) runtime Integrity Measurement Architecture(IMA) maintains a list of hash -- cgit v1.2.2