diff --git a/[refs] b/[refs]
index a42edde2bb58..6470043aa837 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec4a162af388a2716c5314c4aff7029071d09f57
+refs/heads/master: 83c36ccfe4d849f482ea0a62402c7624f4e59f0e
diff --git a/trunk/security/integrity/ima/Kconfig b/trunk/security/integrity/ima/Kconfig
index b6ecfd4d8d78..3d7846de8069 100644
--- a/trunk/security/integrity/ima/Kconfig
+++ b/trunk/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