Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[sfrench/cifs-2.6.git] / security / Kconfig

diff --git a/security/Kconfig b/security/Kconfig
index 8086e61058e373e68054dd166be2e942f4db2e4c..25ffe1b9dc98467d7be1ec373c7024f246172e0b 100644 (file)
--- a/security/Kconfig
+++ b/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.
@@ -104,6 +105,7 @@ config SECURITY_ROOTPLUG
          If you are unsure how to answer this question, answer N.
 
 source security/selinux/Kconfig
+source security/smack/Kconfig
 
 endmenu