commit f4a0391dfa91155bd961673b31eb42d9d45c799d
author Fabio Estevam <festevam@gmail.com> Thu Jan 05 12:49:54 2012 -0200
committer Mimi Zohar <zohar@linux.vnet.ibm.com> Thu Jan 19 21:30:09 2012 -0500
tree 21186b7a48986afa47115cefaf9d385fb9f8dcf7
parent 700920eb5ba4de5417b446c9a8bb008df2b973e0

ima: fix Kconfig dependencies

Fix the following build warning:
warning: (IMA) selects TCG_TPM which has unmet direct dependencies
(HAS_IOMEM && EXPERIMENTAL)

Suggested-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>

security/integrity/ima/Kconfig

diff --git a/security/integrity/ima/Kconfig b/security/integrity/ima/Kconfig
index 4f554f20..063298a 100644
--- a/security/integrity/ima/Kconfig
+++ b/security/integrity/ima/Kconfig
@@ -9,7 +9,7 @@
 	select CRYPTO_HMAC
 	select CRYPTO_MD5
 	select CRYPTO_SHA1
-	select TCG_TPM if !S390 && !UML
+	select TCG_TPM if HAS_IOMEM && !UML
 	select TCG_TIS if TCG_TPM
 	help
 	  The Trusted Computing Group(TCG) runtime Integrity