Merge git://git.infradead.org/mtd-2.6

[linux-2.6] / drivers / infiniband / Kconfig

diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig
index 32cdfb3..ba2d650 100644 (file)
--- a/drivers/infiniband/Kconfig
+++ b/drivers/infiniband/Kconfig
@@ -8,18 +8,37 @@ config INFINIBAND
          any protocols you wish to use as well as drivers for your
          InfiniBand hardware.
 
-config INFINIBAND_USER_VERBS
-       tristate "InfiniBand userspace verbs support"
+config INFINIBAND_USER_MAD
+       tristate "InfiniBand userspace MAD support"
        depends on INFINIBAND
        ---help---
-         Userspace InfiniBand verbs support.  This is the kernel side
-         of userspace verbs, which allows userspace processes to
-         directly access InfiniBand hardware for fast-path
-         operations.  You will also need libibverbs and a hardware
-         driver library from <http://www.openib.org>.
+         Userspace InfiniBand Management Datagram (MAD) support.  This
+         is the kernel side of the userspace MAD support, which allows
+         userspace processes to send and receive MADs. You will also 
+         need libibumad from <http://www.openib.org>.
+
+config INFINIBAND_USER_ACCESS
+       tristate "InfiniBand userspace access (verbs and CM)"
+       depends on INFINIBAND
+       ---help---
+         Userspace InfiniBand access support.  This enables the
+         kernel side of userspace verbs and the userspace
+         communication manager (CM).  This allows userspace processes
+         to set up connections and directly access InfiniBand
+         hardware for fast-path operations.  You will also need
+         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