aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-05 14:26:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-05 14:26:19 -0700
commitc60c6a96b7bb0f1f8bb635fdfcf5b592aaf062b4 (patch)
treea52f8e38956ddaa64a5371993d509875fbe5d726
parentf43100ae39bfeb757b75835ef61f0c2c46c99348 (diff)
parent06c22dadc6d3f9b65e55407a87faaf6a4a014112 (diff)
downloadmrst-s0i3-test-c60c6a96b7bb0f1f8bb635fdfcf5b592aaf062b4.tar.gz
mrst-s0i3-test-c60c6a96b7bb0f1f8bb635fdfcf5b592aaf062b4.tar.xz
mrst-s0i3-test-c60c6a96b7bb0f1f8bb635fdfcf5b592aaf062b4.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: apparmor: depends on NET
-rw-r--r--security/apparmor/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/apparmor/Kconfig b/security/apparmor/Kconfig
index 72555b9ca7d..9b9013b2e32 100644
--- 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