Merge current mainline tree into linux-omap tree

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

diff --git a/security/Kconfig b/security/Kconfig
index 8086e61058e373e68054dd166be2e942f4db2e4c..49fc5fcdfc724238e83b85cfd8d1fe2a9dd699ae 100644 (file)
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -103,6 +103,14 @@ config SECURITY_ROOTPLUG
          
          If you are unsure how to answer this question, answer N.
 
+config SECURITY_LOWMEM
+       tristate "Low memory watermark support"
+       depends on SECURITY
+       help
+         Implements low memory watermark support.
+
+         If you are unsure how to answer this question, answer N.
+
 source security/selinux/Kconfig
 
 endmenu