Revert "ima: remove ACPI dependency"

This reverts commit a674fa46c79ffa37995bd1c8e4daa2b3be5a95ae.

Previous revert was a prereq.

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

1 files changed, 3 insertions, 2 deletions

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