git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devel-stable' into devel
[sfrench/cifs-2.6.git]
/
security
/
apparmor
/
Kconfig
diff --git
a/security/apparmor/Kconfig
b/security/apparmor/Kconfig
index 72555b9ca7d632ef4f48b373445f00f8743ed401..9b9013b2e3211a9c6de17a9001e7939a73bf48e9 100644
(file)
--- a/
security/apparmor/Kconfig
+++ b/
security/apparmor/Kconfig
@@
-1,6
+1,6
@@
config SECURITY_APPARMOR
bool "AppArmor support"
- depends on SECURITY
+ depends on SECURITY
&& NET
select AUDIT
select SECURITY_PATH
select SECURITYFS