From 40018293a20d0016cf2b12662ac282fcfe56f9a6 Mon Sep 17 00:00:00 2001
From: Mimi Zohar <zohar@linux.vnet.ibm.com>
Date: Tue, 4 May 2010 18:16:30 -0400
Subject: [PATCH] --- yaml --- r: 192451 b: refs/heads/master c:
 ba0c1709f4946a5ca1a678f4318ed72c0d409b3c h: refs/heads/master i:   192449:
 af5b587a4693a315a4a2fbdb97fd282cb1a7381a   192447:
 62b0433a5c90a3f57f2d22ddefc3594988aba8bd v: v3

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

diff --git a/[refs] b/[refs]
index 5b784ce17bc8..28be677fb8d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f2ab000c6f2ae46070807a3bf645c45d8639460
+refs/heads/master: ba0c1709f4946a5ca1a678f4318ed72c0d409b3c
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