---

yaml --- r: 192438 b: refs/heads/master c: a674fa4 h: refs/heads/master v: v3
git-mirror · May 5, 2010 · a61075c · a61075c
1 parent 3b4e928
commit a61075c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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