Pull rework-memory-attribute-aliasing into release branch

[linux-2.6-omap-h63xx.git] / drivers / infiniband / Kconfig

diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig
index 325d502e25cdb30df585ecb68a642ac9aeb5818b..ba2d6505e9a45ebaa77a64fac52631baf72e9540 100644 (file)
--- a/drivers/infiniband/Kconfig
+++ b/drivers/infiniband/Kconfig
@@ -29,8 +29,16 @@ config INFINIBAND_USER_ACCESS
          libibverbs, libibcm and a hardware driver library from
          <http://www.openib.org>.
 
+config INFINIBAND_ADDR_TRANS
+       bool
+       depends on INFINIBAND && INET
+       default y
+
 source "drivers/infiniband/hw/mthca/Kconfig"
+source "drivers/infiniband/hw/ipath/Kconfig"
 
 source "drivers/infiniband/ulp/ipoib/Kconfig"
 
+source "drivers/infiniband/ulp/srp/Kconfig"
+
 endmenu