aboutsummaryrefslogtreecommitdiff
path: root/drivers/scsi/qla2xxx/Kconfig
diff options
context:
space:
mode:
authorandrew.vasquez@qlogic.com <andrew.vasquez@qlogic.com>2006-03-09 14:27:18 -0800
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-03-12 09:38:22 -0600
commit48c02fde949f15920c0018d33d285fd39730d24b (patch)
treeaded9282ed2e45b0d0c9e73c95cfd60cfbadfba7 /drivers/scsi/qla2xxx/Kconfig
parent044cc6c8ec311c4ddeebfcc31c53dea282de70b7 (diff)
[SCSI] qla2xxx: Consolidate ISP63xx handling.
As new 23xx firmware will accomidate ISP63xx types. Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/qla2xxx/Kconfig')
-rw-r--r--drivers/scsi/qla2xxx/Kconfig31
1 files changed, 12 insertions, 19 deletions
diff --git a/drivers/scsi/qla2xxx/Kconfig b/drivers/scsi/qla2xxx/Kconfig
index 5758b2566d7..ff40906c66f 100644
--- a/drivers/scsi/qla2xxx/Kconfig
+++ b/drivers/scsi/qla2xxx/Kconfig
@@ -10,14 +10,13 @@ config SCSI_QLA_FC
By default, firmware for the ISP parts will be loaded
via the Firmware Loader interface.
- ISP Firmware Filename
- ---------- -----------------
- 21xx ql2100_fw.bin
- 22xx ql2200_fw.bin
- 2300, 2312 ql2300_fw.bin
- 2322 ql2322_fw.bin
- 6312, 6322 ql6312_fw.bin
- 24xx ql2400_fw.bin
+ 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
Upon request, the driver caches the firmware image until
the driver is unloaded.
@@ -51,23 +50,17 @@ config SCSI_QLA22XX
This driver supports the QLogic 22xx (ISP2200) host adapter family.
config SCSI_QLA2300
- tristate " Build QLogic ISP2300 firmware-module"
+ tristate " Build QLogic ISP2300/ISP6312 firmware-module"
depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
---help---
- This driver supports the QLogic 2300 (ISP2300 and ISP2312) host
- adapter family.
+ This driver supports the QLogic 2300 (ISP2300, ISP2312 and
+ ISP6312) host adapter family.
config SCSI_QLA2322
- tristate " Build QLogic ISP2322 firmware-module"
- depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
- ---help---
- This driver supports the QLogic 2322 (ISP2322) host adapter family.
-
-config SCSI_QLA6312
- tristate " Build QLogic ISP63xx firmware-module"
+ tristate " Build QLogic ISP2322/ISP6322 firmware-module"
depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
---help---
- This driver supports the QLogic 63xx (ISP6312 and ISP6322) host
+ This driver supports the QLogic 2322 (ISP2322 and ISP6322) host
adapter family.
config SCSI_QLA24XX