From 62b0433a5c90a3f57f2d22ddefc3594988aba8bd Mon Sep 17 00:00:00 2001
From: James Morris <jmorris@namei.org>
Date: Fri, 7 May 2010 09:20:03 +1000
Subject: [PATCH] --- yaml --- r: 192447 b: refs/heads/master c:
 83c36ccfe4d849f482ea0a62402c7624f4e59f0e h: refs/heads/master i:   192445:
 518c25d47b4e89acce96c50be2e5e43567d1e86a   192443:
 dacd2a1fdfa2287603fefc01debaf9a512b74acf   192439:
 6ed312ed542904949190faa945134c0dee263a4a   192431:
 4519051d97b7a7b46afc250759e05175db216363   192415:
 2bcb2a9a5255e45ab29181b07c7b8890aa09e81d   192383:
 3f1a100f0bf5a37a4d66a28727545d45f178cd92 v: v3

---
 [refs]                               | 2 +-
 trunk/security/integrity/ima/Kconfig | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a42edde2bb58..6470043aa837 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec4a162af388a2716c5314c4aff7029071d09f57
+refs/heads/master: 83c36ccfe4d849f482ea0a62402c7624f4e59f0e
diff --git a/trunk/security/integrity/ima/Kconfig b/trunk/security/integrity/ima/Kconfig
index b6ecfd4d8d78..3d7846de8069 100644
--- a/trunk/security/integrity/ima/Kconfig
+++ b/trunk/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