aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-08-14 11:18:16 -0700
committerDavid S. Miller <davem@davemloft.net>2017-08-14 11:18:16 -0700
commitcb44a8606f063099991242ada4b8fa2fb26769b3 (patch)
treee1bfb451c527379fcdedae511b17d78cd35e4728
parentnet: phy: Use tab for indentation in Kconfig (diff)
parentChange Kconfig description (diff)
downloadwireguard-linux-cb44a8606f063099991242ada4b8fa2fb26769b3.tar.xz
wireguard-linux-cb44a8606f063099991242ada4b8fa2fb26769b3.zip
Merge branch 'mlnx-i2c'
Ohad Oz says: ==================== Enable Mellanox switch device in I2C mode The following patch set updates global to Mellanox Kconfig files to support configuration of Mellanox Switch (mlxsw) without PCI and with I2C only. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/mellanox/Kconfig5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/Kconfig b/drivers/net/ethernet/mellanox/Kconfig
index 84a200764111..872548cd9431 100644
--- a/drivers/net/ethernet/mellanox/Kconfig
+++ b/drivers/net/ethernet/mellanox/Kconfig
@@ -5,9 +5,10 @@
config NET_VENDOR_MELLANOX
bool "Mellanox devices"
default y
- depends on PCI
+ depends on PCI || I2C
---help---
- If you have a network (Ethernet) card belonging to this class, say Y.
+ If you have a network (Ethernet or RDMA) device belonging to this
+ class, say Y.
Note that the answer to this question doesn't directly affect the
kernel: saying N will just cause the configurator to skip all