diff options
| author | David S. Miller <davem@davemloft.net> | 2012-03-05 21:16:26 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-05 21:16:26 -0500 |
| commit | f6a1ad4295f9291038380178d09978caf6982dd8 (patch) | |
| tree | 7c35e8efe1812baca9c6b9674be1ee02a0495ec3 /arch/s390/Kconfig | |
| parent | 036dafa28da1e2565a8529de2ae663c37b7a0060 (diff) | |
| parent | f3969bf78f140f437f51787dfc2751943ba454d1 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/vmxnet3/vmxnet3_drv.c
Small vmxnet3 conflict with header size bug fix in 'net'.
Signed-off-by: David S. Miller <davem@davemloft.net>
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 |