tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[PATCH] More qla2xxx configuration fixes

This adds the appropriate FW_LOADER pre-requisite and a separate entry
for ISP24xx support.

Thanks to Adrian Bunk and Jesper Juhl for their efforts in fixing this
quirk.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Andrew Vasquez and committed by Linus Torvalds 577a4f81 79d81907

+14 -1
unified split
+14
drivers/scsi/qla2xxx/Kconfig
··· 7 tristate "QLogic ISP2100 host adapter family support" 8 depends on SCSI_QLA2XXX 9 select SCSI_FC_ATTRS 10 ---help--- 11 This driver supports the QLogic 21xx (ISP2100) host adapter family. 12 ··· 15 tristate "QLogic ISP2200 host adapter family support" 16 depends on SCSI_QLA2XXX 17 select SCSI_FC_ATTRS 18 ---help--- 19 This driver supports the QLogic 22xx (ISP2200) host adapter family. 20 ··· 23 tristate "QLogic ISP2300 host adapter family support" 24 depends on SCSI_QLA2XXX 25 select SCSI_FC_ATTRS 26 ---help--- 27 This driver supports the QLogic 2300 (ISP2300 and ISP2312) host 28 adapter family. ··· 32 tristate "QLogic ISP2322 host adapter family support" 33 depends on SCSI_QLA2XXX 34 select SCSI_FC_ATTRS 35 ---help--- 36 This driver supports the QLogic 2322 (ISP2322) host adapter family. 37 ··· 40 tristate "QLogic ISP63xx host adapter family support" 41 depends on SCSI_QLA2XXX 42 select SCSI_FC_ATTRS 43 ---help--- 44 This driver supports the QLogic 63xx (ISP6312 and ISP6322) host 45 adapter family.
··· 7 tristate "QLogic ISP2100 host adapter family support" 8 depends on SCSI_QLA2XXX 9 select SCSI_FC_ATTRS 10 + select FW_LOADER 11 ---help--- 12 This driver supports the QLogic 21xx (ISP2100) host adapter family. 13 ··· 14 tristate "QLogic ISP2200 host adapter family support" 15 depends on SCSI_QLA2XXX 16 select SCSI_FC_ATTRS 17 + select FW_LOADER 18 ---help--- 19 This driver supports the QLogic 22xx (ISP2200) host adapter family. 20 ··· 21 tristate "QLogic ISP2300 host adapter family support" 22 depends on SCSI_QLA2XXX 23 select SCSI_FC_ATTRS 24 + select FW_LOADER 25 ---help--- 26 This driver supports the QLogic 2300 (ISP2300 and ISP2312) host 27 adapter family. ··· 29 tristate "QLogic ISP2322 host adapter family support" 30 depends on SCSI_QLA2XXX 31 select SCSI_FC_ATTRS 32 + select FW_LOADER 33 ---help--- 34 This driver supports the QLogic 2322 (ISP2322) host adapter family. 35 ··· 36 tristate "QLogic ISP63xx host adapter family support" 37 depends on SCSI_QLA2XXX 38 select SCSI_FC_ATTRS 39 + select FW_LOADER 40 ---help--- 41 This driver supports the QLogic 63xx (ISP6312 and ISP6322) host 42 + adapter family. 43 + 44 + config SCSI_QLA24XX 45 + tristate "QLogic ISP24xx host adapter family support" 46 + depends on SCSI_QLA2XXX 47 + select SCSI_FC_ATTRS 48 + select FW_LOADER 49 + ---help--- 50 + This driver supports the QLogic 24xx (ISP2422 and ISP2432) host 51 adapter family.
-1
drivers/scsi/qla2xxx/Makefile
··· 1 EXTRA_CFLAGS += -DUNIQUE_FW_NAME 2 - EXTRA_CFLAGS += -DCONFIG_SCSI_QLA24XX -DCONFIG_SCSI_QLA24XX_MODULE 3 4 qla2xxx-y := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o \ 5 qla_dbg.o qla_sup.o qla_rscn.o qla_attr.o
··· 1 EXTRA_CFLAGS += -DUNIQUE_FW_NAME 2 3 qla2xxx-y := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o \ 4 qla_dbg.o qla_sup.o qla_rscn.o qla_attr.o