trivial: Fix misspelling of "firmware" in qla1280.c

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

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 403ecad..b732297 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -21,7 +21,7 @@ config SCSI
          You also need to say Y here if you have a device which speaks
          the SCSI protocol.  Examples of this include the parallel port
          version of the IOMEGA ZIP drive, USB storage devices, Fibre
-         Channel, FireWire storage and the IDE-SCSI emulation driver.
+         Channel, and FireWire storage.
 
          To compile this driver as a module, choose M here and read
          <file:Documentation/scsi/scsi.txt>.
@@ -101,9 +101,9 @@ config CHR_DEV_OSST
        ---help---
          The OnStream SC-x0 SCSI tape drives cannot be driven by the
          standard st driver, but instead need this special osst driver and
-         use the  /dev/osstX char device nodes (major 206).  Via usb-storage
-         and ide-scsi, you may be able to drive the USB-x0 and DI-x0 drives
-         as well.  Note that there is also a second generation of OnStream
+         use the  /dev/osstX char device nodes (major 206).  Via usb-storage,
+         you may be able to drive the USB-x0 and DI-x0 drives as well.
+         Note that there is also a second generation of OnStream
          tape drives (ADR-x0) that supports the standard SCSI-2 commands for
          tapes (QIC-157) and can be driven by the standard driver st.
          For more information, you may have a look at the SCSI-HOWTO
@@ -352,6 +352,8 @@ config ISCSI_TCP
 
         http://open-iscsi.org
 
+source "drivers/scsi/cxgb3i/Kconfig"
+
 config SGIWD93_SCSI
        tristate "SGI WD93C93 SCSI Driver"
        depends on SGI_HAS_WD93 && SCSI
@@ -603,6 +605,19 @@ config SCSI_FLASHPOINT
          substantial, so users of MultiMaster Host Adapters may not
          wish to include it.
 
+config LIBFC
+       tristate "LibFC module"
+       select SCSI_FC_ATTRS
+       ---help---
+         Fibre Channel library module
+
+config FCOE
+       tristate "FCoE module"
+       depends on PCI
+       select LIBFC
+       ---help---
+         Fibre Channel over Ethernet module
+
 config SCSI_DMX3191D
        tristate "DMX3191D SCSI support"
        depends on PCI && SCSI
@@ -1357,6 +1372,13 @@ config SCSI_LPFC
           This lpfc driver supports the Emulex LightPulse
           Family of Fibre Channel PCI host adapters.
 
+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
+         available via the debugfs filesystem.
+
 config SCSI_SIM710
        tristate "Simple 53c710 SCSI support (Compaq, NCR machines)"
        depends on (EISA || MCA) && SCSI