IB/mlx4: Don't overwrite fast registration page list when posting work request

[safe/jmp/linux-2.6] / drivers / infiniband / Kconfig

diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig
index ba2d650..dd0db67 100644 (file)
--- a/drivers/infiniband/Kconfig
+++ b/drivers/infiniband/Kconfig
@@ -1,25 +1,25 @@
-menu "InfiniBand support"
-
-config INFINIBAND
-       depends on PCI || BROKEN
+menuconfig INFINIBAND
        tristate "InfiniBand support"
+       depends on PCI || BROKEN
+       depends on HAS_IOMEM
        ---help---
          Core support for InfiniBand (IB).  Make sure to also select
          any protocols you wish to use as well as drivers for your
          InfiniBand hardware.
 
+if INFINIBAND
+
 config INFINIBAND_USER_MAD
        tristate "InfiniBand userspace MAD support"
        depends on INFINIBAND
        ---help---
          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 
+         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
@@ -29,16 +29,29 @@ config INFINIBAND_USER_ACCESS
          libibverbs, libibcm and a hardware driver library from
          <http://www.openib.org>.
 
+config INFINIBAND_USER_MEM
+       bool
+       depends on INFINIBAND_USER_ACCESS != n
+       default y
+
 config INFINIBAND_ADDR_TRANS
        bool
-       depends on INFINIBAND && INET
+       depends on INET
+       depends on !(INFINIBAND = y && IPV6 = m)
        default y
 
 source "drivers/infiniband/hw/mthca/Kconfig"
 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"
 
 source "drivers/infiniband/ulp/srp/Kconfig"
 
-endmenu
+source "drivers/infiniband/ulp/iser/Kconfig"
+
+endif # INFINIBAND