diff options
| author | Linus Torvalds | 2012-03-02 03:22:55 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2012-03-02 03:22:55 +0100 |
| commit | 6bba07c613e6663e5b8977eafec3cd3e63241e1c (patch) | |
| tree | a650baf4e935976b10911306ffbe6b53d66f88c7 /arch/s390/Kconfig | |
| parent | Merge tag 'for-linus' of git://github.com/rustyrussell/linux (diff) | |
| parent | [S390] memory hotplug: prevent memory zone interleave (diff) | |
| download | kernel-qcow2-linux-6bba07c613e6663e5b8977eafec3cd3e63241e1c.tar.gz kernel-qcow2-linux-6bba07c613e6663e5b8977eafec3cd3e63241e1c.tar.xz kernel-qcow2-linux-6bba07c613e6663e5b8977eafec3cd3e63241e1c.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
[S390] memory hotplug: prevent memory zone interleave
[S390] crash_dump: remove duplicate include
[S390] KEYS: Enable the compat keyctl wrapper on s390x
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 d1727584230a..6d99a5fcc090 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -227,6 +227,9 @@ config COMPAT config SYSVIPC_COMPAT def_bool y if COMPAT && SYSVIPC +config KEYS_COMPAT + def_bool y if COMPAT && KEYS + config AUDIT_ARCH def_bool y |