Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux...

[cascardo/linux.git] / drivers / scsi / Kconfig

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 1918f54..7d1b431 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -838,6 +838,23 @@ config SCSI_IBMVSCSI
          To compile this driver as a module, choose M here: the
          module will be called ibmvscsi.
 
+config SCSI_IBMVSCSIS
+       tristate "IBM Virtual SCSI Server support"
+       depends on PPC_PSERIES && TARGET_CORE && SCSI && PCI
+       help
+         This is the IBM POWER Virtual SCSI Target Server
+         This driver uses the SRP protocol for communication betwen servers
+         guest and/or the host that run on the same server.
+         More information on VSCSI protocol can be found at www.power.org
+
+         The userspace configuration needed to initialize the driver can be
+         be found here:
+
+         https://github.com/powervm/ibmvscsis/wiki/Configuration
+
+         To compile this driver as a module, choose M here: the
+         module will be called ibmvscsis.
+
 config SCSI_IBMVFC
        tristate "IBM Virtual FC support"
        depends on PPC_PSERIES && SCSI