Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / Kconfig

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 142f632e2a2e45c7377709989d5495382e74f5c9..db95c547c09d6781d68dca561abe230c5d0f57ce 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -42,7 +42,7 @@ config SCSI_DMA
 
 config SCSI_TGT
        tristate "SCSI target support"
-       depends on SCSI && EXPERIMENTAL
+       depends on SCSI
        ---help---
          If you want to use SCSI target mode drivers enable this option.
          If you choose M, the module will be called scsi_tgt.
@@ -883,7 +883,7 @@ config SCSI_IBMVSCSI
          This is the IBM POWER Virtual SCSI Client
 
          To compile this driver as a module, choose M here: the
-         module will be called ibmvscsic.
+         module will be called ibmvscsi.
 
 config SCSI_IBMVSCSIS
        tristate "IBM Virtual SCSI Server support"
@@ -1392,8 +1392,8 @@ config SCSI_SYM53C416
          module will be called sym53c416.
 
 config SCSI_DC395x
-       tristate "Tekram DC395(U/UW/F) and DC315(U) SCSI support (EXPERIMENTAL)"
-       depends on PCI && SCSI && EXPERIMENTAL
+       tristate "Tekram DC395(U/UW/F) and DC315(U) SCSI support"
+       depends on PCI && SCSI
        ---help---
          This driver supports PCI SCSI host adapters based on the ASIC
          TRM-S1040 chip, e.g Tekram DC395(U/UW/F) and DC315(U) variants.
@@ -1618,8 +1618,8 @@ config GVP11_SCSI
          module will be called gvp11.
 
 config SCSI_A4000T
-       tristate "A4000T NCR53c710 SCSI support (EXPERIMENTAL)"
-       depends on AMIGA && SCSI && EXPERIMENTAL
+       tristate "A4000T NCR53c710 SCSI support"
+       depends on AMIGA && SCSI
        select SCSI_SPI_ATTRS
        help
          If you have an Amiga 4000T and have SCSI devices connected to the
@@ -1629,8 +1629,8 @@ config SCSI_A4000T
          module will be called a4000t.
 
 config SCSI_ZORRO7XX
-       tristate "Zorro NCR53c710 SCSI support (EXPERIMENTAL)"
-       depends on ZORRO && SCSI && EXPERIMENTAL
+       tristate "Zorro NCR53c710 SCSI support"
+       depends on ZORRO && SCSI
        select SCSI_SPI_ATTRS
        help
          Support for various NCR53c710-based SCSI controllers on Zorro
@@ -1807,8 +1807,8 @@ config SCSI_BFA_FC
          be called bfa.
 
 config SCSI_VIRTIO
-       tristate "virtio-scsi support (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && VIRTIO
+       tristate "virtio-scsi support"
+       depends on VIRTIO
        help
           This is the virtual HBA driver for virtio.  If the kernel will
           be used in a virtual machine, say Y or M.