diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-15 17:06:48 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-15 17:06:48 -0400 |
| commit | f2cbb4f01936a3e4225692e03b084b78c56d386d (patch) | |
| tree | f89f3d8baa250589a38a4dd2df56f84cddae3c76 /init/Kconfig | |
| parent | 325a479c4c110db278ef3361460a48c4093252cc (diff) | |
| parent | 1016888fb69662936b32ab767c7419a3be9a69d3 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'init/Kconfig')
| -rw-r--r-- | init/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig index 40d286d1d118..a7660ccc693f 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -173,7 +173,7 @@ config AUDIT | |||
| 173 | 173 | ||
| 174 | config AUDITSYSCALL | 174 | config AUDITSYSCALL |
| 175 | bool "Enable system-call auditing support" | 175 | bool "Enable system-call auditing support" |
| 176 | depends on AUDIT && (X86 || PPC64 || ARCH_S390 || IA64) | 176 | depends on AUDIT && (X86 || PPC64 || ARCH_S390 || IA64 || UML) |
| 177 | default y if SECURITY_SELINUX | 177 | default y if SECURITY_SELINUX |
| 178 | help | 178 | help |
| 179 | Enable low-overhead system-call auditing infrastructure that | 179 | Enable low-overhead system-call auditing infrastructure that |
| @@ -442,7 +442,7 @@ config OBSOLETE_MODPARM | |||
| 442 | 442 | ||
| 443 | config MODVERSIONS | 443 | config MODVERSIONS |
| 444 | bool "Module versioning support (EXPERIMENTAL)" | 444 | bool "Module versioning support (EXPERIMENTAL)" |
| 445 | depends on MODULES && EXPERIMENTAL && !UML | 445 | depends on MODULES && EXPERIMENTAL |
| 446 | help | 446 | help |
| 447 | Usually, you have to use modules compiled with your kernel. | 447 | Usually, you have to use modules compiled with your kernel. |
| 448 | Saying Y here makes it sometimes possible to use modules | 448 | Saying Y here makes it sometimes possible to use modules |