Merge tag 'usb-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[mirror_ubuntu-bionic-kernel.git] / drivers / scsi / Kconfig

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 98e5d51a33460e8979a8396db8d8ebf427919f96..7d1b4317eccc1ddea1b380db3900052b731377f7 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
@@ -1433,7 +1450,7 @@ config SCSI_U14_34F_MAX_TAGS
 
 config SCSI_ULTRASTOR
        tristate "UltraStor SCSI support"
-       depends on X86 && ISA && SCSI
+       depends on X86 && ISA && SCSI && ISA_DMA_API
        ---help---
          This is support for the UltraStor 14F, 24F and 34F SCSI-2 host
          adapter family.  This driver is explained in section 3.12 of the