diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 14:26:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 14:26:19 -0700 |
| commit | c60c6a96b7bb0f1f8bb635fdfcf5b592aaf062b4 (patch) | |
| tree | a52f8e38956ddaa64a5371993d509875fbe5d726 | |
| parent | f43100ae39bfeb757b75835ef61f0c2c46c99348 (diff) | |
| parent | 06c22dadc6d3f9b65e55407a87faaf6a4a014112 (diff) | |
| download | kernel_samsung_smdk4412-c60c6a96b7bb0f1f8bb635fdfcf5b592aaf062b4.zip kernel_samsung_smdk4412-c60c6a96b7bb0f1f8bb635fdfcf5b592aaf062b4.tar.gz kernel_samsung_smdk4412-c60c6a96b7bb0f1f8bb635fdfcf5b592aaf062b4.tar.bz2 | |
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/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 |