diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 15:59:59 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 15:59:59 -0500 |
| commit | ccf18968b1bbc2fb117190a1984ac2a826dac228 (patch) | |
| tree | 7bc8fbf5722aecf1e84fa50c31c657864cba1daa /init/Kconfig | |
| parent | e91c021c487110386a07facd0396e6c3b7cf9c1f (diff) | |
| parent | d99cf9d679a520d67f81d805b7cb91c68e1847f0 (diff) | |
Merge ../torvalds-2.6/
Diffstat (limited to 'init/Kconfig')
| -rw-r--r-- | init/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig index ce737e02c5a2..ba42f3793a84 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -105,7 +105,6 @@ config SWAP | |||
| 105 | 105 | ||
| 106 | config SYSVIPC | 106 | config SYSVIPC |
| 107 | bool "System V IPC" | 107 | bool "System V IPC" |
| 108 | depends on MMU | ||
| 109 | ---help--- | 108 | ---help--- |
| 110 | Inter Process Communication is a suite of library functions and | 109 | Inter Process Communication is a suite of library functions and |
| 111 | system calls which let processes (running programs) synchronize and | 110 | system calls which let processes (running programs) synchronize and |
| @@ -190,7 +189,7 @@ config AUDIT | |||
| 190 | 189 | ||
| 191 | config AUDITSYSCALL | 190 | config AUDITSYSCALL |
| 192 | bool "Enable system-call auditing support" | 191 | bool "Enable system-call auditing support" |
| 193 | depends on AUDIT && (X86 || PPC || PPC64 || ARCH_S390 || IA64 || UML || SPARC64) | 192 | depends on AUDIT && (X86 || PPC || PPC64 || S390 || IA64 || UML || SPARC64) |
| 194 | default y if SECURITY_SELINUX | 193 | default y if SECURITY_SELINUX |
| 195 | help | 194 | help |
| 196 | Enable low-overhead system-call auditing infrastructure that | 195 | Enable low-overhead system-call auditing infrastructure that |