Revert "ima: remove ACPI dependency"

This reverts commit a674fa4. Previous revert was a prereq. Signed-off-by: James Morris <[email protected]>
iegor · May 6, 2010 · 83c36cc · 83c36cc
1 parent ec4a162
commit 83c36cc
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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