NLM: Remove redundant printk() in nlmclnt_lock()

[safe/jmp/linux-2.6] / security / Kconfig

diff --git a/security/Kconfig b/security/Kconfig
index 77def9f..9438535 100644 (file)
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -51,6 +51,14 @@ config SECURITY
 
          If you are unsure how to answer this question, answer N.
 
+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.
+
+         If you are unsure how to answer this question, answer N.
+
 config SECURITY_NETWORK
        bool "Socket and Networking Security Hooks"
        depends on SECURITY
@@ -73,9 +81,17 @@ 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 (EXPERIMENTAL)"
-       depends on SECURITY && EXPERIMENTAL
+       bool "File POSIX Capabilities"
        default n
        help
          This enables filesystem capabilities, allowing you to give