summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2011-08-18 20:11:59 +0100
committerRichard Weinberger <richard@nod.at>2011-11-02 14:15:41 +0100
commit3369465ed1a6a9aa9b885a6d7d8e074ecbd782da (patch)
treeac60be76e1d363caab63156c1390f1ab0c4ee96c /security
parentc039aff672a540f8976770e74599d350de1805cb (diff)
downloadlinux-3.10-3369465ed1a6a9aa9b885a6d7d8e074ecbd782da.tar.gz
linux-3.10-3369465ed1a6a9aa9b885a6d7d8e074ecbd782da.tar.bz2
linux-3.10-3369465ed1a6a9aa9b885a6d7d8e074ecbd782da.zip
um: switch to use of drivers/Kconfig
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at>
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 b6ecfd4d8d7..5294d738452 100644
--- a/security/integrity/ima/Kconfig
+++ b/security/integrity/ima/Kconfig
@@ -8,7 +8,7 @@ config IMA
select CRYPTO_HMAC
select CRYPTO_MD5
select CRYPTO_SHA1
- select TCG_TPM if !S390
+ select TCG_TPM if !S390 && !UML
select TCG_TIS if TCG_TPM
help
The Trusted Computing Group(TCG) runtime Integrity