diff options
| author | Roland Dreier <roland@purestorage.com> | 2014-01-22 23:24:21 -0800 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2014-01-22 23:24:21 -0800 |
| commit | fb1b5034e4987b158179a62732fb6dfb8f7ec88e (patch) | |
| tree | 93d02ff7f0f530286fd54d03b632c6eaabc9dcc9 /drivers/infiniband/hw/mlx4/Kconfig | |
| parent | 8f399921ea9a562bc8221258c4b8a7bd69577939 (diff) | |
| parent | 27cdef637c25705b433d5c4deeef4cf8dcb75d6a (diff) | |
| download | op-kernel-dev-fb1b5034e4987b158179a62732fb6dfb8f7ec88e.zip op-kernel-dev-fb1b5034e4987b158179a62732fb6dfb8f7ec88e.tar.gz | |
Merge branch 'ip-roce' into for-next
Conflicts:
drivers/infiniband/hw/mlx4/main.c
Diffstat (limited to 'drivers/infiniband/hw/mlx4/Kconfig')
| -rw-r--r-- | drivers/infiniband/hw/mlx4/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mlx4/Kconfig b/drivers/infiniband/hw/mlx4/Kconfig index 24ab11a..fc01dea 100644 --- a/drivers/infiniband/hw/mlx4/Kconfig +++ b/drivers/infiniband/hw/mlx4/Kconfig @@ -1,6 +1,6 @@ config MLX4_INFINIBAND tristate "Mellanox ConnectX HCA support" - depends on NETDEVICES && ETHERNET && PCI + depends on NETDEVICES && ETHERNET && PCI && INET select NET_VENDOR_MELLANOX select MLX4_CORE ---help--- |
