Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4a0391d authored by Fabio Estevam's avatar Fabio Estevam Committed by Mimi Zohar
Browse files

ima: fix Kconfig dependencies 



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

Suggested-by: default avatarRajiv Andrade <srajiv@linux.vnet.ibm.com>
Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarRajiv Andrade <srajiv@linux.vnet.ibm.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarMimi Zohar <zohar@us.ibm.com>
parent 700920eb

drivers/char/tpm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
menuconfig TCG_TPM

	tristate "TPM Hardware Support"

	depends on HAS_IOMEM

	depends on EXPERIMENTAL

	select SECURITYFS

	---help---

	  If you have a TPM security chip in your system, which

security/integrity/ima/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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