Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb

[linux-block.git] / drivers / infiniband / Kconfig

diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig
index a5dc78ae62d43c5cef9722250f2a7e4db58cddcc..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"