[SCSI] bnx2i: Add bnx2i iSCSI driver.

[safe/jmp/linux-2.6] / drivers / scsi / Kconfig

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 601c2a8..6a19ed9 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>.
@@ -190,20 +191,19 @@ config SCSI_ENCLOSURE
          it has an enclosure device.  Selecting this option will just allow
          certain enclosure conditions to be reported and is not required.
 
-comment "Some SCSI devices (e.g. CD jukebox) support multiple LUNs"
-       depends on SCSI
-
 config SCSI_MULTI_LUN
        bool "Probe all LUNs on each SCSI device"
        depends on SCSI
        help
-         If you have a SCSI device that supports more than one LUN (Logical
-         Unit Number), e.g. a CD jukebox, and only one LUN is detected, you
-         can say Y here to force the SCSI driver to probe for multiple LUNs.
-         A SCSI device with multiple LUNs acts logically like multiple SCSI
-         devices. The vast majority of SCSI devices have only one LUN, and
-         so most people can say N here. The max_luns boot/module parameter 
-         allows to override this setting.
+         Some devices support more than one LUN (Logical Unit Number) in order
+         to allow access to several media, e.g. CD jukebox, USB card reader,
+         mobile phone in mass storage mode. This option forces the kernel to
+         probe for all LUNs by default. This setting can be overriden by
+         max_luns boot/module parameter. Note that this option does not affect
+         devices conforming to SCSI-3 or higher as they can explicitely report
+         their number of LUNs. It is safe to say Y here unless you have one of
+         those rare devices which reacts in an unexpected way when probed for
+         multiple LUNs.
 
 config SCSI_CONSTANTS
        bool "Verbose SCSI error reporting (kernel size +=12K)"
@@ -354,6 +354,7 @@ config ISCSI_TCP
         http://open-iscsi.org
 
 source "drivers/scsi/cxgb3i/Kconfig"
+source "drivers/scsi/bnx2i/Kconfig"
 
 config SGIWD93_SCSI
        tristate "SGI WD93C93 SCSI Driver"
@@ -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 "
@@ -571,6 +573,7 @@ config SCSI_ARCMSR_AER
          To enable this function, choose Y here.
 
 source "drivers/scsi/megaraid/Kconfig.megaraid"
+source "drivers/scsi/mpt2sas/Kconfig"
 
 config SCSI_HPTIOP
        tristate "HighPoint RocketRAID 3xxx/4xxx Controller support"
@@ -613,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
@@ -1031,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
@@ -1379,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
@@ -1387,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
 
@@ -1806,4 +1816,6 @@ source "drivers/scsi/pcmcia/Kconfig"
 
 source "drivers/scsi/device_handler/Kconfig"
 
+source "drivers/scsi/osd/Kconfig"
+
 endmenu