diff options
author | James Morris <jmorris@namei.org> | 2008-10-10 11:09:47 +1100 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2008-10-10 11:09:47 +1100 |
commit | 9ac684fc38cf17fbd25c0c9e388713c5ddfa3b14 (patch) | |
tree | f2715b294d64efe1c5788f4fa5f0b25cdff071a7 /security/Kconfig | |
parent | 3fa8749e584b55f1180411ab1b51117190bac1e5 (diff) | |
parent | 81990fbdd18b9cfdc93dc221ff3250f81468aed8 (diff) | |
download | op-kernel-dev-9ac684fc38cf17fbd25c0c9e388713c5ddfa3b14.zip op-kernel-dev-9ac684fc38cf17fbd25c0c9e388713c5ddfa3b14.tar.gz |
Merge branch 'next' into for-linus
Diffstat (limited to 'security/Kconfig')
-rw-r--r-- | security/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/security/Kconfig b/security/Kconfig index 5592939..d9f47ce 100644 --- 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 |