diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-03-13 11:32:54 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-03-13 11:33:03 -0400 |
| commit | ef15eda98217f5183f457e7a2de8b79555ef908b (patch) | |
| tree | f8f22b48f7bb237c9aa6646175f3e17eeac4af0e /arch/s390/Kconfig | |
| parent | 5cb4ac3a583d4ee18c8682ab857e093c4a0d0895 (diff) | |
| parent | ef334a20d84f52407a8a2afd02ddeaecbef0ad3d (diff) | |
Merge branch 'x86/cleanups' into perf/uprobes
Merge reason: We want to merge a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/s390/Kconfig')
| -rw-r--r-- | arch/s390/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index d1727584230..6d99a5fcc09 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig | |||
| @@ -227,6 +227,9 @@ config COMPAT | |||
| 227 | config SYSVIPC_COMPAT | 227 | config SYSVIPC_COMPAT |
| 228 | def_bool y if COMPAT && SYSVIPC | 228 | def_bool y if COMPAT && SYSVIPC |
| 229 | 229 | ||
| 230 | config KEYS_COMPAT | ||
| 231 | def_bool y if COMPAT && KEYS | ||
| 232 | |||
| 230 | config AUDIT_ARCH | 233 | config AUDIT_ARCH |
| 231 | def_bool y | 234 | def_bool y |
| 232 | 235 | ||