mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-03 17:40:04 +00:00
[SCSI] qla2xxx: Kconfig: two fixes
Original From: Adrian Bunk Here's a composite patch with Adrian's original additions and help-text with the new Kconfig variable SCSI_QLA_FC. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
parent
455c53ec61
commit
8e0df4a757
3 changed files with 14 additions and 10 deletions
|
@ -80,7 +80,7 @@ obj-$(CONFIG_SCSI_QLOGIC_FAS) += qlogicfas408.o qlogicfas.o
|
||||||
obj-$(CONFIG_PCMCIA_QLOGIC) += qlogicfas408.o
|
obj-$(CONFIG_PCMCIA_QLOGIC) += qlogicfas408.o
|
||||||
obj-$(CONFIG_SCSI_QLOGIC_FC) += qlogicfc.o
|
obj-$(CONFIG_SCSI_QLOGIC_FC) += qlogicfc.o
|
||||||
obj-$(CONFIG_SCSI_QLOGIC_1280) += qla1280.o
|
obj-$(CONFIG_SCSI_QLOGIC_1280) += qla1280.o
|
||||||
obj-$(CONFIG_SCSI_QLA2XXX) += qla2xxx/
|
obj-$(CONFIG_SCSI_QLA_FC) += qla2xxx/
|
||||||
obj-$(CONFIG_SCSI_LPFC) += lpfc/
|
obj-$(CONFIG_SCSI_LPFC) += lpfc/
|
||||||
obj-$(CONFIG_SCSI_PAS16) += pas16.o
|
obj-$(CONFIG_SCSI_PAS16) += pas16.o
|
||||||
obj-$(CONFIG_SCSI_SEAGATE) += seagate.o
|
obj-$(CONFIG_SCSI_SEAGATE) += seagate.o
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
config SCSI_QLA2XXX
|
config SCSI_QLA_FC
|
||||||
tristate "QLogic QLA2XXX Fibre Channel Support"
|
tristate "QLogic QLA2XXX Fibre Channel Support"
|
||||||
depends on PCI && SCSI
|
depends on PCI && SCSI
|
||||||
select SCSI_FC_ATTRS
|
select SCSI_FC_ATTRS
|
||||||
|
@ -28,43 +28,47 @@ config SCSI_QLA2XXX
|
||||||
|
|
||||||
config SCSI_QLA2XXX_EMBEDDED_FIRMWARE
|
config SCSI_QLA2XXX_EMBEDDED_FIRMWARE
|
||||||
bool " Use firmware-loader modules (DEPRECATED)"
|
bool " Use firmware-loader modules (DEPRECATED)"
|
||||||
depends on SCSI_QLA2XXX
|
depends on SCSI_QLA_FC
|
||||||
|
help
|
||||||
|
This option offers you the deprecated firmware-loader
|
||||||
|
modules that have been obsoleted by the usage of the
|
||||||
|
Firmware Loader interface in the qla2xxx driver.
|
||||||
|
|
||||||
config SCSI_QLA21XX
|
config SCSI_QLA21XX
|
||||||
tristate " Build QLogic ISP2100 firmware-module"
|
tristate " Build QLogic ISP2100 firmware-module"
|
||||||
depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
|
depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
|
||||||
---help---
|
---help---
|
||||||
This driver supports the QLogic 21xx (ISP2100) host adapter family.
|
This driver supports the QLogic 21xx (ISP2100) host adapter family.
|
||||||
|
|
||||||
config SCSI_QLA22XX
|
config SCSI_QLA22XX
|
||||||
tristate " Build QLogic ISP2200 firmware-module"
|
tristate " Build QLogic ISP2200 firmware-module"
|
||||||
depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
|
depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
|
||||||
---help---
|
---help---
|
||||||
This driver supports the QLogic 22xx (ISP2200) host adapter family.
|
This driver supports the QLogic 22xx (ISP2200) host adapter family.
|
||||||
|
|
||||||
config SCSI_QLA2300
|
config SCSI_QLA2300
|
||||||
tristate " Build QLogic ISP2300 firmware-module"
|
tristate " Build QLogic ISP2300 firmware-module"
|
||||||
depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
|
depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
|
||||||
---help---
|
---help---
|
||||||
This driver supports the QLogic 2300 (ISP2300 and ISP2312) host
|
This driver supports the QLogic 2300 (ISP2300 and ISP2312) host
|
||||||
adapter family.
|
adapter family.
|
||||||
|
|
||||||
config SCSI_QLA2322
|
config SCSI_QLA2322
|
||||||
tristate " Build QLogic ISP2322 firmware-module"
|
tristate " Build QLogic ISP2322 firmware-module"
|
||||||
depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
|
depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
|
||||||
---help---
|
---help---
|
||||||
This driver supports the QLogic 2322 (ISP2322) host adapter family.
|
This driver supports the QLogic 2322 (ISP2322) host adapter family.
|
||||||
|
|
||||||
config SCSI_QLA6312
|
config SCSI_QLA6312
|
||||||
tristate " Build QLogic ISP63xx firmware-module"
|
tristate " Build QLogic ISP63xx firmware-module"
|
||||||
depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
|
depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
|
||||||
---help---
|
---help---
|
||||||
This driver supports the QLogic 63xx (ISP6312 and ISP6322) host
|
This driver supports the QLogic 63xx (ISP6312 and ISP6322) host
|
||||||
adapter family.
|
adapter family.
|
||||||
|
|
||||||
config SCSI_QLA24XX
|
config SCSI_QLA24XX
|
||||||
tristate " Build QLogic ISP24xx firmware-module"
|
tristate " Build QLogic ISP24xx firmware-module"
|
||||||
depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
|
depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
|
||||||
---help---
|
---help---
|
||||||
This driver supports the QLogic 24xx (ISP2422 and ISP2432) host
|
This driver supports the QLogic 24xx (ISP2422 and ISP2432) host
|
||||||
adapter family.
|
adapter family.
|
||||||
|
|
|
@ -3,7 +3,7 @@ EXTRA_CFLAGS += -DUNIQUE_FW_NAME
|
||||||
qla2xxx-y := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o \
|
qla2xxx-y := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o \
|
||||||
qla_dbg.o qla_sup.o qla_rscn.o qla_attr.o
|
qla_dbg.o qla_sup.o qla_rscn.o qla_attr.o
|
||||||
|
|
||||||
obj-$(CONFIG_SCSI_QLA2XXX) += qla2xxx.o
|
obj-$(CONFIG_SCSI_QLA_FC) += qla2xxx.o
|
||||||
|
|
||||||
qla2100-y := ql2100.o ql2100_fw.o
|
qla2100-y := ql2100.o ql2100_fw.o
|
||||||
qla2200-y := ql2200.o ql2200_fw.o
|
qla2200-y := ql2200.o ql2200_fw.o
|
||||||
|
|
Loading…
Reference in a new issue