Merge branch 'srp' of master.kernel.org:/pub/scm/linux/kernel/git/rol…

…and/infiniband
blinkosm · Nov 5, 2005 · 127f2fa · 127f2fa
2 parents ba77df5 + aef9ec3
commit 127f2fa
Show file tree

Hide file tree

Showing 7 changed files with 2,091 additions and 0 deletions.
diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig
@@ -33,4 +33,6 @@ source "drivers/infiniband/hw/mthca/Kconfig"
 
 source "drivers/infiniband/ulp/ipoib/Kconfig"
 
+source "drivers/infiniband/ulp/srp/Kconfig"
+
 endmenu
diff --git a/drivers/infiniband/Makefile b/drivers/infiniband/Makefile
@@ -1,3 +1,4 @@
 obj-$(CONFIG_INFINIBAND)		+= core/
 obj-$(CONFIG_INFINIBAND_MTHCA)		+= hw/mthca/
 obj-$(CONFIG_INFINIBAND_IPOIB)		+= ulp/ipoib/
+obj-$(CONFIG_INFINIBAND_SRP)		+= ulp/srp/
diff --git a/drivers/infiniband/ulp/srp/Kbuild b/drivers/infiniband/ulp/srp/Kbuild
@@ -0,0 +1 @@
+obj-$(CONFIG_INFINIBAND_SRP)			+= ib_srp.o
diff --git a/drivers/infiniband/ulp/srp/Kconfig b/drivers/infiniband/ulp/srp/Kconfig
@@ -0,0 +1,11 @@
+config INFINIBAND_SRP
+	tristate "InfiniBand SCSI RDMA Protocol"
+	depends on INFINIBAND && SCSI
+	---help---
+	  Support for the SCSI RDMA Protocol over InfiniBand.  This
+	  allows you to access storage devices that speak SRP over
+	  InfiniBand.
+
+	  The SRP protocol is defined by the INCITS T10 technical
+	  committee.  See <http://www.t10.org/>.
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -33,4 +33,6 @@ source "drivers/infiniband/hw/mthca/Kconfig"

		source "drivers/infiniband/ulp/ipoib/Kconfig"

		source "drivers/infiniband/ulp/srp/Kconfig"

		endmenu