Merge omap-drivers

[linux-2.6-omap-h63xx.git] / security / Kconfig

diff --git a/security/Kconfig b/security/Kconfig
index 67785df264e511c83550455240f633dc99cc3483..873adfc84de376f64d4db1b54a6ce04776a82b25 100644 (file)
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -93,15 +93,11 @@ config SECURITY_ROOTPLUG
          
          If you are unsure how to answer this question, answer N.
 
-config SECURITY_SECLVL
-       tristate "BSD Secure Levels"
+config SECURITY_LOWMEM
+       tristate "Low memory watermark support"
        depends on SECURITY
-       select CRYPTO
-       select CRYPTO_SHA1
        help
-         Implements BSD Secure Levels as an LSM.  See
-         <file:Documentation/seclvl.txt> for instructions on how to use this
-         module.
+         Implements low memory watermark support.
 
          If you are unsure how to answer this question, answer N.