LSM: put CONFIG_SECURITY back into the Kconfig file (was lost in the merge)

1 files changed, 13 insertions, 2 deletions

diff --git a/security/Kconfig b/security/Kconfig
index d00116860002d..11a27b002beb9 100644
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -4,9 +4,20 @@
 
 menu "Security options"
 
+config SECURITY
+	bool "Enable different security models"
+	help
+	  This allows you to choose different security modules to be
+	  configured into your kernel.
+
+	  If this option is not selected, the default Linux security
+	  model will be used.
+
+	  If you are unsure how to answer this question, answer N.
+
 config SECURITY_CAPABILITIES
-	bool
-	default y
+	tristate "Default Linux Capabilities"
+	depends on SECURITY!=n
 	help
 	  This enables the "default" Linux capabilities functionality.
 	  If you are unsure how to answer this question, answer Y.