diff options
| author | Roland Dreier <roland@purestorage.com> | 2014-01-23 11:24:21 +0400 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2014-01-23 11:24:21 +0400 |
| commit | fb1b5034e4987b158179a62732fb6dfb8f7ec88e (patch) | |
| tree | 93d02ff7f0f530286fd54d03b632c6eaabc9dcc9 /drivers/infiniband/Kconfig | |
| parent | 8f399921ea9a562bc8221258c4b8a7bd69577939 (diff) | |
| parent | 27cdef637c25705b433d5c4deeef4cf8dcb75d6a (diff) | |
| download | linux-fb1b5034e4987b158179a62732fb6dfb8f7ec88e.tar.xz | |
Merge branch 'ip-roce' into for-next
Conflicts:
drivers/infiniband/hw/mlx4/main.c
Diffstat (limited to 'drivers/infiniband/Kconfig')
| -rw-r--r-- | drivers/infiniband/Kconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig index 10219ee92191..77089399359b 100644 --- a/drivers/infiniband/Kconfig +++ b/drivers/infiniband/Kconfig @@ -3,6 +3,8 @@ menuconfig INFINIBAND depends on PCI || BROKEN depends on HAS_IOMEM depends on NET + depends on INET + depends on m || IPV6 != m ---help--- Core support for InfiniBand (IB). Make sure to also select any protocols you wish to use as well as drivers for your @@ -38,8 +40,7 @@ config INFINIBAND_USER_MEM config INFINIBAND_ADDR_TRANS bool - depends on INET - depends on !(INFINIBAND = y && IPV6 = m) + depends on INFINIBAND default y source "drivers/infiniband/hw/mthca/Kconfig" |