aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2010-05-06 19:20:03 -0400
committerJames Morris <jmorris@namei.org>2010-05-06 19:20:03 -0400
commit83c36ccfe4d849f482ea0a62402c7624f4e59f0e (patch)
tree381c005c107bc5cf8db594308c5a3b0ec2bd1d34 /security
parentec4a162af388a2716c5314c4aff7029071d09f57 (diff)
Revert "ima: remove ACPI dependency"
This reverts commit a674fa46c79ffa37995bd1c8e4daa2b3be5a95ae. Previous revert was a prereq. Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security')
-rw-r--r--security/integrity/ima/Kconfig5
1 files changed, 3 insertions, 2 deletions
diff --git a/security/integrity/ima/Kconfig b/security/integrity/ima/Kconfig
index b6ecfd4d8d78..3d7846de8069 100644
--- a/security/integrity/ima/Kconfig
+++ b/security/integrity/ima/Kconfig
@@ -2,14 +2,15 @@
2# 2#
3config IMA 3config IMA
4 bool "Integrity Measurement Architecture(IMA)" 4 bool "Integrity Measurement Architecture(IMA)"
5 depends on ACPI
5 depends on SECURITY 6 depends on SECURITY
6 select SECURITYFS 7 select SECURITYFS
7 select CRYPTO 8 select CRYPTO
8 select CRYPTO_HMAC 9 select CRYPTO_HMAC
9 select CRYPTO_MD5 10 select CRYPTO_MD5
10 select CRYPTO_SHA1 11 select CRYPTO_SHA1
11 select TCG_TPM if !S390 12 select TCG_TPM
12 select TCG_TIS if TCG_TPM 13 select TCG_TIS
13 help 14 help
14 The Trusted Computing Group(TCG) runtime Integrity 15 The Trusted Computing Group(TCG) runtime Integrity
15 Measurement Architecture(IMA) maintains a list of hash 16 Measurement Architecture(IMA) maintains a list of hash