X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=security%2FKconfig;h=811f00270546ce972a10701543edd11024deae59;hb=5061bcd119547453b32c847d2b9490a052bc1755;hp=fb3425231927e6fdec4031a8162ae9e409f5d8b3;hpb=d6daf8d8cc5ccf90247def5551ee9c3e8555e848;p=linux-2.6-omap-h63xx.git

diff --git a/security/Kconfig b/security/Kconfig
index fb342523192..811f0027054 100644
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -73,17 +73,8 @@ config SECURITY_NETWORK_XFRM
 	  IPSec.
 	  If you are unsure how to answer this question, answer N.
 
-config SECURITY_CAPABILITIES
-	bool "Default Linux Capabilities"
-	depends on SECURITY
-	default y
-	help
-	  This enables the "default" Linux capabilities functionality.
-	  If you are unsure how to answer this question, answer Y.
-
 config SECURITY_FILE_CAPABILITIES
-	bool "File POSIX Capabilities (EXPERIMENTAL)"
-	depends on (SECURITY=n || SECURITY_CAPABILITIES!=n) && EXPERIMENTAL
+	bool "File POSIX Capabilities"
 	default n
 	help
 	  This enables filesystem capabilities, allowing you to give