summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2015-12-27 06:01:21 +0000
committerPeter Robinson <pbrobinson@gmail.com>2015-12-27 06:01:21 +0000
commitac6e024f6a1cf5cd7b17e022a932c8746d8f3d3a (patch)
tree9d1e0c9ccf0fea88ca108d308e85394b04934d88 /config-generic
parent839487c4cadf84e2c2fdfedff8a5f763102d2335 (diff)
downloadkernel-ac6e024f6a1cf5cd7b17e022a932c8746d8f3d3a.tar.gz
kernel-ac6e024f6a1cf5cd7b17e022a932c8746d8f3d3a.tar.xz
kernel-ac6e024f6a1cf5cd7b17e022a932c8746d8f3d3a.zip
Minor ARMv7/aarch64/ppc/s390 config cleanups (no other functioal changes)
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic9
1 files changed, 5 insertions, 4 deletions
diff --git a/config-generic b/config-generic
index a784dffbb..6c999c510 100644
--- a/config-generic
+++ b/config-generic
@@ -189,8 +189,6 @@ CONFIG_INFINIBAND_CXGB4=m
CONFIG_SCSI_CXGB3_ISCSI=m
CONFIG_SCSI_CXGB4_ISCSI=m
# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
-CONFIG_MLX4_INFINIBAND=m
-CONFIG_MLX5_INFINIBAND=m
CONFIG_INFINIBAND_NES=m
# CONFIG_INFINIBAND_NES_DEBUG is not set
CONFIG_INFINIBAND_QIB=m
@@ -1689,9 +1687,12 @@ CONFIG_MLX4_CORE=m
CONFIG_MLX4_EN=m
CONFIG_MLX4_EN_DCB=y
CONFIG_MLX4_EN_VXLAN=y
+CONFIG_MLX4_INFINIBAND=m
CONFIG_MLX5_CORE=m
CONFIG_MLX5_CORE_EN=y
+CONFIG_MLX5_INFINIBAND=m
# CONFIG_MLXSW_CORE is not set
+# CONFIG_MLX4_DEBUG is not set
# CONFIG_SFC is not set
# CONFIG_FDDI is not set
@@ -4763,8 +4764,8 @@ CONFIG_LATENCYTOP=y
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
CONFIG_EARLY_PRINTK_DBGP=y
# CONFIG_PAGE_POISONING is not set
-# CONFIG_CRASH_DUMP is not set
-# CONFIG_CRASH is not set
+CONFIG_CRASH=m
+CONFIG_CRASH_DUMP=y
# CONFIG_GCOV_KERNEL is not set
CONFIG_KGDB=y