diff --git a/[refs] b/[refs]
index f56c33fa5c30..bcd670f0545c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28042fabf43b9a8ccfaa38f8c8187cc525e53fd3
+refs/heads/master: a69f15890292b5449f9056b4bb322b044e6ce0c6
diff --git a/trunk/security/integrity/ima/Kconfig b/trunk/security/integrity/ima/Kconfig
index 063298a797e8..35664fe6daa1 100644
--- a/trunk/security/integrity/ima/Kconfig
+++ b/trunk/security/integrity/ima/Kconfig
@@ -10,7 +10,7 @@ config IMA
 	select CRYPTO_MD5
 	select CRYPTO_SHA1
 	select TCG_TPM if HAS_IOMEM && !UML
-	select TCG_TIS if TCG_TPM
+	select TCG_TIS if TCG_TPM && X86
 	help
 	  The Trusted Computing Group(TCG) runtime Integrity
 	  Measurement Architecture(IMA) maintains a list of hash