diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-03-29 04:22:18 +0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-03-29 04:22:18 +0400 |
| commit | 90f959bcb386da2c71613dcefc6a285e054a539e (patch) | |
| tree | ee3e9dd4111d4aad12e579cb0c2c159114dff263 /security/Kconfig | |
| parent | 41f13fe81dd1b08723ab9f3fc3c7f29cfa81f1a5 (diff) | |
| parent | 07d43ba98621f08e252a48c96b258b4d572b0257 (diff) | |
| download | linux-90f959bcb386da2c71613dcefc6a285e054a539e.tar.xz | |
drm: merge Linux master into HEAD
Conflicts:
drivers/gpu/drm/drm_info.c
drivers/gpu/drm/drm_proc.c
drivers/gpu/drm/i915/i915_gem_debugfs.c
Diffstat (limited to 'security/Kconfig')
| -rw-r--r-- | security/Kconfig | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/security/Kconfig b/security/Kconfig index 9438535d7fd0..bb244774e9d7 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 |