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
This commit is contained in:
Linus Torvalds 2010-08-05 14:26:19 -07:00
commit c60c6a96b7

View file

@ -1,6 +1,6 @@
config SECURITY_APPARMOR
bool "AppArmor support"
depends on SECURITY
depends on SECURITY && NET
select AUDIT
select SECURITY_PATH
select SECURITYFS