1 files changed, 28 insertions, 1 deletions

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index e11cca4c784..36900c71a59 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -399,6 +399,17 @@ config SCSI_3W_9XXX
           Please read the comments at the top of
           <file:drivers/scsi/3w-9xxx.c>.
 
+config SCSI_3W_SAS
+        tristate "3ware 97xx SAS/SATA-RAID support"
+        depends on PCI && SCSI
+        help
+          This driver supports the LSI 3ware 9750 6Gb/s SAS/SATA-RAID cards.
+
+          <http://www.lsi.com>
+
+          Please read the comments at the top of
+          <file:drivers/scsi/3w-sas.c>.
+
 config SCSI_7000FASST
         tristate "7000FASST SCSI support"
         depends on ISA && SCSI && ISA_DMA_API
@@ -621,6 +632,14 @@ config SCSI_FLASHPOINT
           substantial, so users of MultiMaster Host Adapters may not
           wish to include it.
 
+config VMWARE_PVSCSI
+        tristate "VMware PVSCSI driver support"
+        depends on PCI && SCSI && X86
+        help
+          This driver supports VMware's para virtualized SCSI HBA.
+          To compile this driver as a module, choose M here: the
+          module will be called vmw_pvscsi.
+
 config LIBFC
         tristate "LibFC module"
         select SCSI_FC_ATTRS
@@ -644,7 +663,7 @@ config FCOE
 config FCOE_FNIC
         tristate "Cisco FNIC Driver"
         depends on PCI && X86
-        select LIBFC
+        select LIBFCOE
         help
           This is support for the Cisco PCI-Express FCoE HBA.
 
@@ -1818,6 +1837,14 @@ config SCSI_PMCRAID
         ---help---
           This driver supports the PMC SIERRA MaxRAID adapters.
 
+config SCSI_PM8001
+        tristate "PMC-Sierra SPC 8001 SAS/SATA Based Host Adapter driver"
+        depends on PCI && SCSI
+        select SCSI_SAS_LIBSAS
+        help
+          This driver supports PMC-Sierra PCIE SAS/SATA 8x6G SPC 8001 chip
+          based host adapters.
+
 config SCSI_SRP
         tristate "SCSI RDMA Protocol helper library"
         depends on SCSI && PCI