summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorFabio Estevam <festevam@gmail.com>2012-01-05 12:49:54 -0200
committerMimi Zohar <zohar@linux.vnet.ibm.com>2012-01-19 21:30:09 -0500
commitf4a0391dfa91155bd961673b31eb42d9d45c799d (patch)
tree21186b7a48986afa47115cefaf9d385fb9f8dcf7 /security
parent700920eb5ba4de5417b446c9a8bb008df2b973e0 (diff)
downloadop-kernel-dev-f4a0391dfa91155bd961673b31eb42d9d45c799d.zip
op-kernel-dev-f4a0391dfa91155bd961673b31eb42d9d45c799d.tar.gz
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>
Diffstat (limited to 'security')
-rw-r--r--security/integrity/ima/Kconfig2
1 files changed, 1 insertions, 1 deletions
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 @@ config IMA
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
OpenPOWER on IntegriCloud