diff --git a/[refs] b/[refs]
index 5b784ce17bc8..28be677fb8d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f2ab000c6f2ae46070807a3bf645c45d8639460
+refs/heads/master: ba0c1709f4946a5ca1a678f4318ed72c0d409b3c
diff --git a/trunk/security/integrity/ima/Kconfig b/trunk/security/integrity/ima/Kconfig
index 3d7846de8069..b6ecfd4d8d78 100644
--- 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