Blackfin Serial Driver: fix error while transferring large files

[karo-tx-linux.git] / drivers / infiniband / Kconfig

diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig
index a193dfbf99d2f38dd6c9066efb63daeaa14d3b1b..dd0db67bf8d777bd8bfb2b9421b81c621fd0dab9 100644 (file)
--- a/drivers/infiniband/Kconfig
+++ b/drivers/infiniband/Kconfig
@@ -37,6 +37,7 @@ config INFINIBAND_USER_MEM
 config INFINIBAND_ADDR_TRANS
        bool
        depends on INET
+       depends on !(INFINIBAND = y && IPV6 = m)
        default y
 
 source "drivers/infiniband/hw/mthca/Kconfig"
@@ -44,8 +45,8 @@ source "drivers/infiniband/hw/ipath/Kconfig"
 source "drivers/infiniband/hw/ehca/Kconfig"
 source "drivers/infiniband/hw/amso1100/Kconfig"
 source "drivers/infiniband/hw/cxgb3/Kconfig"
-
 source "drivers/infiniband/hw/mlx4/Kconfig"
+source "drivers/infiniband/hw/nes/Kconfig"
 
 source "drivers/infiniband/ulp/ipoib/Kconfig"