diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 18:13:32 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 18:13:32 -0500 |
| commit | f0eef25339f92f7cd4aeea23d9ae97987a5a1e82 (patch) | |
| tree | 2472e94d39f43a9580a6d2d5d92de0b749023263 /security/Kconfig | |
| parent | 0cfea5dd98205f2fa318836da664a7d7df1afbc1 (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Diffstat (limited to 'security/Kconfig')
| -rw-r--r-- | security/Kconfig | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/security/Kconfig b/security/Kconfig index 67785df264e5..460e5c9cf496 100644 --- a/security/Kconfig +++ b/security/Kconfig | |||
| @@ -93,18 +93,6 @@ config SECURITY_ROOTPLUG | |||
| 93 | 93 | ||
| 94 | If you are unsure how to answer this question, answer N. | 94 | If you are unsure how to answer this question, answer N. |
| 95 | 95 | ||
| 96 | config SECURITY_SECLVL | ||
| 97 | tristate "BSD Secure Levels" | ||
| 98 | depends on SECURITY | ||
| 99 | select CRYPTO | ||
| 100 | select CRYPTO_SHA1 | ||
| 101 | help | ||
| 102 | Implements BSD Secure Levels as an LSM. See | ||
| 103 | <file:Documentation/seclvl.txt> for instructions on how to use this | ||
| 104 | module. | ||
| 105 | |||
| 106 | If you are unsure how to answer this question, answer N. | ||
| 107 | |||
| 108 | source security/selinux/Kconfig | 96 | source security/selinux/Kconfig |
| 109 | 97 | ||
| 110 | endmenu | 98 | endmenu |