From: Christopher Covington Date: Fri, 9 Dec 2016 21:53:05 +0000 (-0500) Subject: net: mlx5: Fix Kconfig help text X-Git-Tag: Ubuntu-5.2.0-15.16~7933^2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d33695fbfab73a4a6550fa5c2d0bacc68d7c5901;p=mirror_ubuntu-eoan-kernel.git net: mlx5: Fix Kconfig help text Since the following commit, Infiniband and Ethernet have not been mutually exclusive. Fixes: 4aa17b28 mlx5: Enable mutual support for IB and Ethernet Signed-off-by: Christopher Covington Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig index aae46884bf93..521cfdb7d11e 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig +++ b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig @@ -18,8 +18,6 @@ config MLX5_CORE_EN default n ---help--- Ethernet support in Mellanox Technologies ConnectX-4 NIC. - Ethernet and Infiniband support in ConnectX-4 are currently mutually - exclusive. config MLX5_CORE_EN_DCB bool "Data Center Bridging (DCB) Support"