Merge remote-tracking branch 'wireless-next/master' into mac80211-next

[firefly-linux-kernel-4.4.55.git] / drivers / infiniband / Kconfig

diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig
index 5ceda710f516bc4721e14961a504fa7e2c3054a9..77089399359b70bbcdccabc264c5e4e8089a1bdb 100644 (file)
--- 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"
@@ -53,6 +54,7 @@ source "drivers/infiniband/hw/mlx4/Kconfig"
 source "drivers/infiniband/hw/mlx5/Kconfig"
 source "drivers/infiniband/hw/nes/Kconfig"
 source "drivers/infiniband/hw/ocrdma/Kconfig"
+source "drivers/infiniband/hw/usnic/Kconfig"
 
 source "drivers/infiniband/ulp/ipoib/Kconfig"