openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Fabio Estevam 2012-01-05 12:49:54 -02:00 committed by Mimi Zohar
parent 700920eb5b
commit f4a0391dfa
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/char/tpm/Kconfig
View File

@ -5,7 +5,6 @@
menuconfig TCG_TPM menuconfig TCG_TPM
tristate "TPM Hardware Support" tristate "TPM Hardware Support"
depends on HAS_IOMEM depends on HAS_IOMEM
depends on EXPERIMENTAL
select SECURITYFS select SECURITYFS
---help--- ---help---
If you have a TPM security chip in your system, which If you have a TPM security chip in your system, which

2
security/integrity/ima/Kconfig
View File

@ -9,7 +9,7 @@ config IMA
select CRYPTO_HMAC select CRYPTO_HMAC
select CRYPTO_MD5 select CRYPTO_MD5
select CRYPTO_SHA1 select CRYPTO_SHA1
select TCG_TPM if !S390 && !UML select TCG_TPM if HAS_IOMEM && !UML
select TCG_TIS if TCG_TPM select TCG_TIS if TCG_TPM
help help
The Trusted Computing Group(TCG) runtime Integrity The Trusted Computing Group(TCG) runtime Integrity