[SCSI] mvsas: move into new directory drivers/scsi/mvsas/

[~andy/linux] / drivers / scsi / Kconfig

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index e2f44e6c0bcb8cd19a7558357e012ef9d1dcb23f..6e8106a70b3d23966b845eae994993ed948bd0fa 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -121,10 +121,11 @@ config BLK_DEV_SR
        tristate "SCSI CDROM support"
        depends on SCSI
        ---help---
-         If you want to use a SCSI or FireWire CD-ROM under Linux,
-         say Y and read the SCSI-HOWTO and the CDROM-HOWTO at
-         <http://www.tldp.org/docs.html#howto>. Also make sure to say
-         Y or M to "ISO 9660 CD-ROM file system support" later.
+         If you want to use a CD or DVD drive attached to your computer
+         by SCSI, FireWire, USB or ATAPI, say Y and read the SCSI-HOWTO
+         and the CDROM-HOWTO at <http://www.tldp.org/docs.html#howto>.
+
+         Make sure to say Y or M to "ISO 9660 CD-ROM file system support".
 
          To compile this driver as a module, choose M here and read
          <file:Documentation/scsi/scsi.txt>.
@@ -507,6 +508,7 @@ config SCSI_AIC7XXX_OLD
 
 source "drivers/scsi/aic7xxx/Kconfig.aic79xx"
 source "drivers/scsi/aic94xx/Kconfig"
+source "drivers/scsi/mvsas/Kconfig"
 
 config SCSI_DPT_I2O
        tristate "Adaptec I2O RAID support "
@@ -614,13 +616,30 @@ config LIBFC
        ---help---
          Fibre Channel library module
 
+config LIBFCOE
+       tristate "LibFCoE module"
+       select LIBFC
+       ---help---
+         Library for Fibre Channel over Ethernet module
+
 config FCOE
        tristate "FCoE module"
        depends on PCI
-       select LIBFC
+       select LIBFCOE
        ---help---
          Fibre Channel over Ethernet module
 
+config FCOE_FNIC
+       tristate "Cisco FNIC Driver"
+       depends on PCI && X86
+       select LIBFC
+       help
+         This is support for the Cisco PCI-Express FCoE HBA.
+
+         To compile this driver as a module, choose M here and read
+         <file:Documentation/scsi/scsi.txt>.
+         The module will be called fnic.
+
 config SCSI_DMX3191D
        tristate "DMX3191D SCSI support"
        depends on PCI && SCSI
@@ -1032,16 +1051,6 @@ config SCSI_IZIP_SLOW_CTR
 
          Generally, saying N is fine.
 
-config SCSI_MVSAS
-       tristate "Marvell 88SE6440 SAS/SATA support"
-       depends on PCI && SCSI
-       select SCSI_SAS_LIBSAS
-       help
-         This driver supports Marvell SAS/SATA PCI devices.
-
-         To compiler this driver as a module, choose M here: the module
-         will be called mvsas.
-
 config SCSI_NCR53C406A
        tristate "NCR53c406a SCSI support"
        depends on ISA && SCSI
@@ -1380,7 +1389,7 @@ config SCSI_LPFC_DEBUG_FS
        bool "Emulex LightPulse Fibre Channel debugfs Support"
        depends on SCSI_LPFC && DEBUG_FS
        help
-         This makes debugging infomation from the lpfc driver
+         This makes debugging information from the lpfc driver
          available via the debugfs filesystem.
 
 config SCSI_SIM710
@@ -1388,7 +1397,7 @@ config SCSI_SIM710
        depends on (EISA || MCA) && SCSI
        select SCSI_SPI_ATTRS
        ---help---
-         This driver for NCR53c710 based SCSI host adapters.
+         This driver is for NCR53c710 based SCSI host adapters.
 
          It currently supports Compaq EISA cards and NCR MCA cards