diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-18 16:54:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-18 16:54:12 -0400 |
| commit | 19fa95e9e999ee2b0d7adfbd1a687b136afcd6f1 (patch) | |
| tree | 99bd4cf3f47965b52f43a5fde01b2e53e01f77ba /init/Kconfig | |
| parent | ba483d574b43b05fa4c78550b874c7e24424ff2a (diff) | |
| parent | 0107b3cf3225aed6ddde4fa8dbcd4ed643b34f4d (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6
Diffstat (limited to 'init/Kconfig')
| -rw-r--r-- | init/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig index a7660ccc693f..b1091d7542ce 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -164,6 +164,7 @@ config SYSCTL | |||
| 164 | 164 | ||
| 165 | config AUDIT | 165 | config AUDIT |
| 166 | bool "Auditing support" | 166 | bool "Auditing support" |
| 167 | depends on NET | ||
| 167 | default y if SECURITY_SELINUX | 168 | default y if SECURITY_SELINUX |
| 168 | help | 169 | help |
| 169 | Enable auditing infrastructure that can be used with another | 170 | Enable auditing infrastructure that can be used with another |
| @@ -173,7 +174,7 @@ config AUDIT | |||
| 173 | 174 | ||
| 174 | config AUDITSYSCALL | 175 | config AUDITSYSCALL |
| 175 | bool "Enable system-call auditing support" | 176 | bool "Enable system-call auditing support" |
| 176 | depends on AUDIT && (X86 || PPC64 || ARCH_S390 || IA64 || UML) | 177 | depends on AUDIT && (X86 || PPC || PPC64 || ARCH_S390 || IA64 || UML) |
| 177 | default y if SECURITY_SELINUX | 178 | default y if SECURITY_SELINUX |
| 178 | help | 179 | help |
| 179 | Enable low-overhead system-call auditing infrastructure that | 180 | Enable low-overhead system-call auditing infrastructure that |