diff options
author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-03-06 08:09:16 +0000 |
---|---|---|
committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-03-06 08:09:16 +0000 |
commit | d282e4d9353b9e7971713aa9e78da716e4a1262d (patch) | |
tree | 123aa2391841f37f4b8ae80c02eda4094e17994a /arch/s390/Kconfig | |
parent | 2c0fad8e907abf059b21bdb24d183dcbf8d14c10 (diff) | |
parent | 192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d (diff) |
Merge commit 'v3.3-rc6' into fbdev-next
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 config SYSVIPC_COMPAT def_bool y if COMPAT && SYSVIPC +config KEYS_COMPAT + def_bool y if COMPAT && KEYS + config AUDIT_ARCH def_bool y |