Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c60c6a96 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of... 

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
parents f43100ae 06c22dad

security/apparmor/Kconfig

+1 −1
Original line number Diff line number Diff line 
config SECURITY_APPARMOR

	bool "AppArmor support"

	depends on SECURITY

	depends on SECURITY && NET

	select AUDIT

	select SECURITY_PATH

	select SECURITYFS