Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-12 16:58:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "ima: remove ACPI dependency"

Browse Source 
This reverts commit a674fa46c79ffa37995bd1c8e4daa2b3be5a95ae.

Previous revert was a prereq.

Signed-off-by: James Morris <jmorris@namei.org>
This commit is contained in:
James Morris 2010-05-07 09:20:03 +10:00
parent ec4a162af3
commit 83c36ccfe4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
security/integrity/ima/Kconfig
View File

@ -2,14 +2,15 @@
# #
config IMA config IMA
bool "Integrity Measurement Architecture(IMA)" bool "Integrity Measurement Architecture(IMA)"
depends on ACPI
depends on SECURITY depends on SECURITY
select SECURITYFS select SECURITYFS
select CRYPTO select CRYPTO
select CRYPTO_HMAC select CRYPTO_HMAC
select CRYPTO_MD5 select CRYPTO_MD5
select CRYPTO_SHA1 select CRYPTO_SHA1
select TCG_TPM if !S390 select TCG_TPM
select TCG_TIS if TCG_TPM select TCG_TIS
help help
The Trusted Computing Group(TCG) runtime Integrity The Trusted Computing Group(TCG) runtime Integrity
Measurement Architecture(IMA) maintains a list of hash Measurement Architecture(IMA) maintains a list of hash