diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-20 12:35:34 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-20 12:35:34 -0400 |
| commit | 8ba08378b479f472b37b83542c31bdad465033cf (patch) | |
| tree | f4421227b3065e786c9041cf0ce0073a249e011b /init/Kconfig | |
| parent | 34b727c135ff651f153be5757056d25678b6d018 (diff) | |
| parent | 8b22c249e7de453961e4d253b19fc2a0bdd65d53 (diff) | |
Auto merge with /home/aegl/GIT/linus
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 |