From 95afe154724c508f6f6721cdd55ee4ba74513256 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 5 Jan 2012 12:49:54 -0200 Subject: [PATCH] --- yaml --- r: 292272 b: refs/heads/master c: f4a0391dfa91155bd961673b31eb42d9d45c799d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/tpm/Kconfig | 1 - trunk/security/integrity/ima/Kconfig | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c7ab31bae484..5d2245164bc2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 700920eb5ba4de5417b446c9a8bb008df2b973e0 +refs/heads/master: f4a0391dfa91155bd961673b31eb42d9d45c799d diff --git a/trunk/drivers/char/tpm/Kconfig b/trunk/drivers/char/tpm/Kconfig index 7fc75e47e6d0..a048199ce866 100644 --- a/trunk/drivers/char/tpm/Kconfig +++ b/trunk/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/trunk/security/integrity/ima/Kconfig b/trunk/security/integrity/ima/Kconfig index 4f554f20dc97..063298a797e8 100644 --- a/trunk/security/integrity/ima/Kconfig +++ b/trunk/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