Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 577a4f81 authored by Andrew Vasquez's avatar Andrew Vasquez Committed by Linus Torvalds
Browse files

[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: default avatarLinus Torvalds <torvalds@osdl.org>
parent 79d81907

drivers/scsi/qla2xxx/Kconfig

+14 −0
Original line number Original line Diff line number Diff line
@@ -7,6 +7,7 @@ config SCSI_QLA21XX 
	tristate "QLogic ISP2100 host adapter family support"

	tristate "QLogic ISP2100 host adapter family support"

	depends on SCSI_QLA2XXX

	depends on SCSI_QLA2XXX

        select SCSI_FC_ATTRS

        select SCSI_FC_ATTRS

	select FW_LOADER

	---help---

	---help---

	This driver supports the QLogic 21xx (ISP2100) host adapter family.

	This driver supports the QLogic 21xx (ISP2100) host adapter family.
@@ -14,6 +15,7 @@ config SCSI_QLA22XX 
	tristate "QLogic ISP2200 host adapter family support"

	tristate "QLogic ISP2200 host adapter family support"

	depends on SCSI_QLA2XXX

	depends on SCSI_QLA2XXX

        select SCSI_FC_ATTRS

        select SCSI_FC_ATTRS

	select FW_LOADER

	---help---

	---help---

	This driver supports the QLogic 22xx (ISP2200) host adapter family.

	This driver supports the QLogic 22xx (ISP2200) host adapter family.
@@ -21,6 +23,7 @@ config SCSI_QLA2300 
	tristate "QLogic ISP2300 host adapter family support"

	tristate "QLogic ISP2300 host adapter family support"

	depends on SCSI_QLA2XXX

	depends on SCSI_QLA2XXX

        select SCSI_FC_ATTRS

        select SCSI_FC_ATTRS

	select FW_LOADER

	---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.
@@ -29,6 +32,7 @@ config SCSI_QLA2322 
	tristate "QLogic ISP2322 host adapter family support"

	tristate "QLogic ISP2322 host adapter family support"

	depends on SCSI_QLA2XXX

	depends on SCSI_QLA2XXX

        select SCSI_FC_ATTRS

        select SCSI_FC_ATTRS

	select FW_LOADER

	---help---

	---help---

	This driver supports the QLogic 2322 (ISP2322) host adapter family.

	This driver supports the QLogic 2322 (ISP2322) host adapter family.
@@ -36,6 +40,16 @@ config SCSI_QLA6312 
	tristate "QLogic ISP63xx host adapter family support"

	tristate "QLogic ISP63xx host adapter family support"

	depends on SCSI_QLA2XXX

	depends on SCSI_QLA2XXX

        select SCSI_FC_ATTRS

        select SCSI_FC_ATTRS

	select FW_LOADER

	---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

	tristate "QLogic ISP24xx host adapter family support"

	depends on SCSI_QLA2XXX

	select SCSI_FC_ATTRS

	select FW_LOADER

	---help---

	This driver supports the QLogic 24xx (ISP2422 and ISP2432) host

	adapter family.

drivers/scsi/qla2xxx/Makefile

+0 −1
Original line number Original line Diff line number Diff line 
EXTRA_CFLAGS += -DUNIQUE_FW_NAME

EXTRA_CFLAGS += -DUNIQUE_FW_NAME

EXTRA_CFLAGS += -DCONFIG_SCSI_QLA24XX -DCONFIG_SCSI_QLA24XX_MODULE





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