Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / drivers / scsi / qla2xxx / Kconfig

diff --git a/drivers/scsi/qla2xxx/Kconfig b/drivers/scsi/qla2xxx/Kconfig
index 6c73b84..8c865b9 100644 (file)
--- a/drivers/scsi/qla2xxx/Kconfig
+++ b/drivers/scsi/qla2xxx/Kconfig
@@ -1,41 +1,26 @@
-config SCSI_QLA2XXX
-       tristate
-       default (SCSI && PCI)
-       depends on SCSI && PCI
-
-config SCSI_QLA21XX
-       tristate "QLogic ISP2100 host adapter family support"
-       depends on SCSI_QLA2XXX
-        select SCSI_FC_ATTRS
+config SCSI_QLA_FC
+       tristate "QLogic QLA2XXX Fibre Channel Support"
+       depends on PCI && SCSI
+       select SCSI_FC_ATTRS
+       select FW_LOADER
        ---help---
-       This driver supports the QLogic 21xx (ISP2100) host adapter family.
+       This qla2xxx driver supports all QLogic Fibre Channel
+       PCI and PCIe host adapters.
 
-config SCSI_QLA22XX
-       tristate "QLogic ISP2200 host adapter family support"
-       depends on SCSI_QLA2XXX
-        select SCSI_FC_ATTRS
-       ---help---
-       This driver supports the QLogic 22xx (ISP2200) host adapter family.
+       By default, firmware for the ISP parts will be loaded
+       via the Firmware Loader interface.
 
-config SCSI_QLA2300
-       tristate "QLogic ISP2300 host adapter family support"
-       depends on SCSI_QLA2XXX
-        select SCSI_FC_ATTRS
-       ---help---
-       This driver supports the QLogic 2300 (ISP2300 and ISP2312) host
-       adapter family.
+       ISP               Firmware Filename
+       ----------        -----------------
+       21xx              ql2100_fw.bin
+       22xx              ql2200_fw.bin
+       2300, 2312, 6312  ql2300_fw.bin
+       2322, 6322        ql2322_fw.bin
+       24xx              ql2400_fw.bin
 
-config SCSI_QLA2322
-       tristate "QLogic ISP2322 host adapter family support"
-       depends on SCSI_QLA2XXX
-        select SCSI_FC_ATTRS
-       ---help---
-       This driver supports the QLogic 2322 (ISP2322) host adapter family.
+       Upon request, the driver caches the firmware image until
+       the driver is unloaded.
 
-config SCSI_QLA6312
-       tristate "QLogic ISP63xx host adapter family support"
-       depends on SCSI_QLA2XXX
-        select SCSI_FC_ATTRS
-       ---help---
-       This driver supports the QLogic 63xx (ISP6312 and ISP6322) host
-       adapter family.
+       Firmware images can be retrieved from:
+
+               ftp://ftp.qlogic.com/outgoing/linux/firmware/