commit c60c6a96b7bb0f1f8bb635fdfcf5b592aaf062b4
author Linus Torvalds <torvalds@linux-foundation.org> Thu Aug 05 14:26:19 2010 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Thu Aug 05 14:26:19 2010 -0700
tree a52f8e38956ddaa64a5371993d509875fbe5d726
parent f43100ae39bfeb757b75835ef61f0c2c46c99348
parent 06c22dadc6d3f9b65e55407a87faaf6a4a014112

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

security/apparmor/Kconfig

diff --git a/security/apparmor/Kconfig b/security/apparmor/Kconfig
index 72555b9..9b9013b 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