Merge branch 'master' into upstream

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

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 5570cdb..6956909 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -821,6 +821,20 @@ config SCSI_IBMVSCSI
          To compile this driver as a module, choose M here: the
          module will be called ibmvscsic.
 
+config SCSI_IBMVSCSIS
+       tristate "IBM Virtual SCSI Server support"
+       depends on PPC_PSERIES && SCSI_TGT && SCSI_SRP
+       help
+         This is the SRP target driver for IBM pSeries virtual environments.
+
+         The userspace component needed to initialize the driver and
+         documentation can be found:
+
+         http://stgt.berlios.de/
+
+         To compile this driver as a module, choose M here: the
+         module will be called ibmvstgt.
+
 config SCSI_INITIO
        tristate "Initio 9100U(W) support"
        depends on PCI && SCSI
@@ -968,8 +982,13 @@ config SCSI_STEX
        tristate "Promise SuperTrak EX Series support"
        depends on PCI && SCSI
        ---help---
-         This driver supports Promise SuperTrak EX8350/8300/16350/16300
-         Storage controllers.
+         This driver supports Promise SuperTrak EX series storage controllers.
+
+         Promise provides Linux RAID configuration utility for these
+         controllers. Please visit <http://www.promise.com> to download.
+
+         To compile this driver as a module, choose M here: the
+         module will be called stex.
 
 config SCSI_SYM53C8XX_2
        tristate "SYM53C8XX Version 2 SCSI support"