diff options
| author | James Morris <jmorris@namei.org> | 2010-05-07 09:20:03 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-05-07 09:20:03 +1000 |
| commit | 83c36ccfe4d849f482ea0a62402c7624f4e59f0e (patch) | |
| tree | 381c005c107bc5cf8db594308c5a3b0ec2bd1d34 | |
| parent | ec4a162af388a2716c5314c4aff7029071d09f57 (diff) | |
| download | kernel_samsung_espresso10-83c36ccfe4d849f482ea0a62402c7624f4e59f0e.zip kernel_samsung_espresso10-83c36ccfe4d849f482ea0a62402c7624f4e59f0e.tar.gz kernel_samsung_espresso10-83c36ccfe4d849f482ea0a62402c7624f4e59f0e.tar.bz2 | |
Revert "ima: remove ACPI dependency"
This reverts commit a674fa46c79ffa37995bd1c8e4daa2b3be5a95ae.
Previous revert was a prereq.
Signed-off-by: James Morris <jmorris@namei.org>
| -rw-r--r-- | security/integrity/ima/Kconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/security/integrity/ima/Kconfig b/security/integrity/ima/Kconfig index b6ecfd4..3d7846d 100644 --- a/security/integrity/ima/Kconfig +++ b/security/integrity/ima/Kconfig @@ -2,14 +2,15 @@ # config IMA bool "Integrity Measurement Architecture(IMA)" + depends on ACPI depends on SECURITY select SECURITYFS select CRYPTO select CRYPTO_HMAC select CRYPTO_MD5 select CRYPTO_SHA1 - select TCG_TPM if !S390 - select TCG_TIS if TCG_TPM + select TCG_TPM + select TCG_TIS help The Trusted Computing Group(TCG) runtime Integrity Measurement Architecture(IMA) maintains a list of hash |