From: James Morris <jmorris@namei.org>
Date: Thu, 6 May 2010 23:20:03 +0000 (+1000)
Subject: Revert "ima: remove ACPI dependency"
X-Git-Tag: v2.6.35-rc1~488^2^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=83c36ccfe4d849f482ea0a62402c7624f4e59f0e;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Revert "ima: remove ACPI dependency"

This reverts commit a674fa46c79ffa37995bd1c8e4daa2b3be5a95ae.

Previous revert was a prereq.

Signed-off-by: James Morris <jmorris@namei.org>
---

diff --git a/security/integrity/ima/Kconfig b/security/integrity/ima/Kconfig
index b6ecfd4..3d7846d 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