diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 17:26:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 17:26:19 -0400 |
| commit | c60c6a96b7bb0f1f8bb635fdfcf5b592aaf062b4 (patch) | |
| tree | a52f8e38956ddaa64a5371993d509875fbe5d726 | |
| parent | f43100ae39bfeb757b75835ef61f0c2c46c99348 (diff) | |
| parent | 06c22dadc6d3f9b65e55407a87faaf6a4a014112 (diff) | |
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 72555b9ca7d6..9b9013b2e321 100644 --- a/security/apparmor/Kconfig +++ b/security/apparmor/Kconfig | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | config SECURITY_APPARMOR | 1 | config SECURITY_APPARMOR |
| 2 | bool "AppArmor support" | 2 | bool "AppArmor support" |
| 3 | depends on SECURITY | 3 | depends on SECURITY && NET |
| 4 | select AUDIT | 4 | select AUDIT |
| 5 | select SECURITY_PATH | 5 | select SECURITY_PATH |
| 6 | select SECURITYFS | 6 | select SECURITYFS |