Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 127f2fa3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'srp' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

parents ba77df57 aef9ec39

drivers/infiniband/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -33,4 +33,6 @@ source "drivers/infiniband/hw/mthca/Kconfig" 


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



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



endmenu

drivers/infiniband/Makefile

+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_INFINIBAND)		+= core/

obj-$(CONFIG_INFINIBAND_MTHCA)		+= hw/mthca/

obj-$(CONFIG_INFINIBAND_IPOIB)		+= ulp/ipoib/

obj-$(CONFIG_INFINIBAND_SRP)		+= ulp/srp/

drivers/infiniband/ulp/srp/Kbuild

0 → 100644
+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_INFINIBAND_SRP)			+= ib_srp.o

drivers/infiniband/ulp/srp/Kconfig

0 → 100644
+11 −0
Original line number Diff line number Diff line 
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/>.