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

diff --git a/security/Kconfig b/security/Kconfig
index d9f47ce7e20..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.
 
@@ -81,6 +82,15 @@ config SECURITY_NETWORK_XFRM
 	  IPSec.
 	  If you are unsure how to answer this question, answer N.
 
+config SECURITY_PATH
+	bool "Security hooks for pathname based access control"
+	depends on SECURITY
+	help
+	  This enables the security hooks for pathname based access control.
+	  If enabled, a security module can use these hooks to
+	  implement pathname based access controls.
+	  If you are unsure how to answer this question, answer N.
+
 config SECURITY_FILE_CAPABILITIES
 	bool "File POSIX Capabilities"
 	default n
@@ -125,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