Merge branch 'master' into upstream

[sfrench/cifs-2.6.git] / drivers / infiniband / ulp / iser / Kconfig

diff --git a/drivers/infiniband/ulp/iser/Kconfig b/drivers/infiniband/ulp/iser/Kconfig
index fead87d1eff95202d09b2d37f403e0f2d4ad347e..aecbb9083f0c06c770dfb20aba8c1068c9629e1f 100644 (file)
--- a/drivers/infiniband/ulp/iser/Kconfig
+++ b/drivers/infiniband/ulp/iser/Kconfig
@@ -1,11 +1,12 @@
 config INFINIBAND_ISER
-       tristate "ISCSI RDMA Protocol"
-       depends on INFINIBAND && SCSI
+       tristate "iSCSI Extensions for RDMA (iSER)"
+       depends on INFINIBAND && SCSI && INET
        select SCSI_ISCSI_ATTRS
        ---help---
-         Support for the ISCSI RDMA Protocol over InfiniBand.  This
-         allows you to access storage devices that speak ISER/ISCSI
-         over InfiniBand.
+         Support for the iSCSI Extensions for RDMA (iSER) Protocol
+          over InfiniBand. This allows you to access storage devices
+          that speak iSCSI over iSER over InfiniBand.
 
-         The ISER protocol is defined by IETF.
-         See <http://www.ietf.org/>.
+         The iSER protocol is defined by IETF.
+         See <http://www.ietf.org/internet-drafts/draft-ietf-ips-iser-05.txt>
+         and <http://www.infinibandta.org/members/spec/iser_annex_060418.pdf>