diff options
| author | Fabio Estevam <festevam@gmail.com> | 2012-01-05 12:49:54 -0200 |
|---|---|---|
| committer | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2012-01-19 21:30:09 -0500 |
| commit | f4a0391dfa91155bd961673b31eb42d9d45c799d (patch) | |
| tree | 21186b7a48986afa47115cefaf9d385fb9f8dcf7 | |
| parent | 700920eb5ba4de5417b446c9a8bb008df2b973e0 (diff) | |
| download | linux-3.10-f4a0391dfa91155bd961673b31eb42d9d45c799d.tar.gz linux-3.10-f4a0391dfa91155bd961673b31eb42d9d45c799d.tar.bz2 linux-3.10-f4a0391dfa91155bd961673b31eb42d9d45c799d.zip | |
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>
| -rw-r--r-- | drivers/char/tpm/Kconfig | 1 | ||||
| -rw-r--r-- | security/integrity/ima/Kconfig | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig index 7fc75e47e6d..a048199ce86 100644 --- a/drivers/char/tpm/Kconfig +++ b/drivers/char/tpm/Kconfig @@ -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 diff --git a/security/integrity/ima/Kconfig b/security/integrity/ima/Kconfig index 4f554f20dc9..063298a797e 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 |