summaryrefslogtreecommitdiffstats
path: root/config-x86_64-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-x86_64-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-x86_64-generic')
-rw-r--r--config-x86_64-generic4
1 files changed, 0 insertions, 4 deletions
diff --git a/config-x86_64-generic b/config-x86_64-generic
index e845c89f4..9d13391fc 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -184,10 +184,6 @@ CONFIG_NTB_TRANSPORT=m
# 10GigE
#
CONFIG_IP1000=m
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_EN_DCB=y
-CONFIG_MLX4_EN_VXLAN=y
-# CONFIG_MLX4_DEBUG is not set
CONFIG_SFC=m
CONFIG_SFC_MCDI_MON=y
CONFIG_SFC_SRIOV=y