diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:57:26 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-23 00:11:07 -0400 |
| commit | 057316cc6a5b521b332a1d7ccc871cd60c904c74 (patch) | |
| tree | 4333e608da237c73ff69b10878025cca96dcb4c8 /security/Kconfig | |
| parent | 3e2dab9a1c2deb03c311eb3f83466009147ed4d3 (diff) | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
Merge branch 'linus' into test
Conflicts:
MAINTAINERS
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/acpi/sleep.c
drivers/acpi/Kconfig
drivers/pnp/Makefile
drivers/pnp/quirks.c
Signed-off-by: Len Brown <len.brown@intel.com>
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 559293922a47..d9f47ce7e207 100644 --- a/security/Kconfig +++ b/security/Kconfig | |||
| @@ -51,6 +51,14 @@ config SECURITY | |||
| 51 | 51 | ||
| 52 | If you are unsure how to answer this question, answer N. | 52 | If you are unsure how to answer this question, answer N. |
| 53 | 53 | ||
| 54 | config SECURITYFS | ||
| 55 | bool "Enable the securityfs filesystem" | ||
| 56 | help | ||
| 57 | This will build the securityfs filesystem. It is currently used by | ||
| 58 | the TPM bios character driver. It is not used by SELinux or SMACK. | ||
| 59 | |||
| 60 | If you are unsure how to answer this question, answer N. | ||
| 61 | |||
| 54 | config SECURITY_NETWORK | 62 | config SECURITY_NETWORK |
| 55 | bool "Socket and Networking Security Hooks" | 63 | bool "Socket and Networking Security Hooks" |
| 56 | depends on SECURITY | 64 | depends on SECURITY |