X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=security%2FKconfig;h=bb244774e9d765ae10e41768f5dfd5c40f1f3069;hb=2d9aaa76288b9a4d6aca5067154ceb09122aacd8;hp=9438535d7fd0f2bec51905538bd27b7f73f3ad25;hpb=2a50b2560ee956808da0b644cb529608dee65274;p=linux-2.6-omap-h63xx.git

diff --git a/security/Kconfig b/security/Kconfig
index 9438535d7fd..bb244774e9d 100644
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -55,7 +55,8 @@ config SECURITYFS
 	bool "Enable the securityfs filesystem"
 	help
 	  This will build the securityfs filesystem.  It is currently used by
-	  the TPM bios character driver.  It is not used by SELinux or SMACK.
+	  the TPM bios character driver and IMA, an integrity provider.  It is
+	  not used by SELinux or SMACK.
 
 	  If you are unsure how to answer this question, answer N.
 
@@ -134,6 +135,9 @@ config SECURITY_DEFAULT_MMAP_MIN_ADDR
 
 source security/selinux/Kconfig
 source security/smack/Kconfig
+source security/tomoyo/Kconfig
+
+source security/integrity/ima/Kconfig
 
 endmenu