diff options
author | David S. Miller <davem@davemloft.net> | 2010-09-09 06:49:04 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-09-09 06:49:04 (GMT) |
commit | e199e6136ce6b151e6638ae93dca60748424d900 (patch) | |
tree | 0d66e0b5d227c36b005e4f5537f4bbcfc6ed4904 /security/apparmor/Kconfig | |
parent | 972c40b5bee429c84ba727f8ac0a08292bc5dc3d (diff) | |
parent | d56557af19867edb8c0e96f8e26399698a08857f (diff) | |
download | linux-fsl-qoriq-e199e6136ce6b151e6638ae93dca60748424d900.tar.xz |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'security/apparmor/Kconfig')
-rw-r--r-- | security/apparmor/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
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 |