git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[pandora-kernel.git]
/
security
/
Kconfig
diff --git
a/security/Kconfig
b/security/Kconfig
index
49b51f9
..
62ed471
100644
(file)
--- a/
security/Kconfig
+++ b/
security/Kconfig
@@
-73,17
+73,9
@@
config SECURITY_NETWORK_XFRM
IPSec.
If you are unsure how to answer this question, answer N.
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)"
config SECURITY_FILE_CAPABILITIES
bool "File POSIX Capabilities (EXPERIMENTAL)"
- depends on
(SECURITY=n || SECURITY_CAPABILITIES!=n) &&
EXPERIMENTAL
+ depends on EXPERIMENTAL
default n
help
This enables filesystem capabilities, allowing you to give
default n
help
This enables filesystem capabilities, allowing you to give