Revert "ima: remove ACPI dependency"

This reverts commit a674fa46.

Previous revert was a prereq.
Signed-off-by: NJames Morris <jmorris@namei.org>

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