diff --git a/[refs] b/[refs] index 44034dc39367..3fb3a86c654c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 374ea019cacfa8b69ae49eea993b74cb5968970b +refs/heads/master: f71ea9ddf0ff110f3fcbb89a46686bfba264014c diff --git a/trunk/security/Kconfig b/trunk/security/Kconfig index 8086e61058e3..389e151e3b68 100644 --- a/trunk/security/Kconfig +++ b/trunk/security/Kconfig @@ -76,6 +76,7 @@ config SECURITY_NETWORK_XFRM 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.