Home Home > GIT Browse > SLE15-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2002-07-19 19:13:24 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2002-07-19 19:13:24 -0700
commit18610ba94ca1ffd34e3bc30a6fdac78c45b2610a (patch)
treeae9293acf3f51e5392f83b4f07163138a76a34a8
parent3bfd74ba08de3f1ef3fc7893a14004d38a402a5d (diff)
parent7a19fd4a264ce6c5041fac18c0725b4b47fabeb6 (diff)
Merge bk://lsm.bkbits.net/linus-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
-rw-r--r--security/Config.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/security/Config.in b/security/Config.in
index 77379cefdae1..272d1656731d 100644
--- a/security/Config.in
+++ b/security/Config.in
@@ -3,5 +3,6 @@
#
mainmenu_option next_comment
comment 'Security options'
+define_bool CONFIG_SECURITY_CAPABILITIES y
tristate 'Capabilities Support' CONFIG_SECURITY_CAPABILITIES
endmenu