aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/qla2xxx
diff options
context:
space:
mode:
authorAndrew Vasquez <andrew.vasquez@qlogic.com>2005-07-28 01:10:59 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-28 01:31:35 -0400
commit577a4f8102d54b504cb22eb021b89e957e8df18f (patch)
tree4413a1fec41bc2c3ecbc96ddb35f949f820967ff /drivers/scsi/qla2xxx
parent79d81907594e1ec4d5171653dde7cb9e9cb87de2 (diff)
[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>
Diffstat (limited to 'drivers/scsi/qla2xxx')
-rw-r--r--drivers/scsi/qla2xxx/Kconfig14
-rw-r--r--drivers/scsi/qla2xxx/Makefile1
2 files changed, 14 insertions, 1 deletions
diff --git a/drivers/scsi/qla2xxx/Kconfig b/drivers/scsi/qla2xxx/Kconfig
index 6c73b84c6e64..c1c1c687bcbd 100644
--- a/drivers/scsi/qla2xxx/Kconfig
+++ b/drivers/scsi/qla2xxx/Kconfig
@@ -7,6 +7,7 @@ config SCSI_QLA21XX
7 tristate "QLogic ISP2100 host adapter family support" 7 tristate "QLogic ISP2100 host adapter family support"
8 depends on SCSI_QLA2XXX 8 depends on SCSI_QLA2XXX
9 select SCSI_FC_ATTRS 9 select SCSI_FC_ATTRS
10 select FW_LOADER
10 ---help--- 11 ---help---
11 This driver supports the QLogic 21xx (ISP2100) host adapter family. 12 This driver supports the QLogic 21xx (ISP2100) host adapter family.
12 13
@@ -14,6 +15,7 @@ config SCSI_QLA22XX
14 tristate "QLogic ISP2200 host adapter family support" 15 tristate "QLogic ISP2200 host adapter family support"
15 depends on SCSI_QLA2XXX 16 depends on SCSI_QLA2XXX
16 select SCSI_FC_ATTRS 17 select SCSI_FC_ATTRS
18 select FW_LOADER
17 ---help--- 19 ---help---
18 This driver supports the QLogic 22xx (ISP2200) host adapter family. 20 This driver supports the QLogic 22xx (ISP2200) host adapter family.
19 21
@@ -21,6 +23,7 @@ config SCSI_QLA2300
21 tristate "QLogic ISP2300 host adapter family support" 23 tristate "QLogic ISP2300 host adapter family support"
22 depends on SCSI_QLA2XXX 24 depends on SCSI_QLA2XXX
23 select SCSI_FC_ATTRS 25 select SCSI_FC_ATTRS
26 select FW_LOADER
24 ---help--- 27 ---help---
25 This driver supports the QLogic 2300 (ISP2300 and ISP2312) host 28 This driver supports the QLogic 2300 (ISP2300 and ISP2312) host
26 adapter family. 29 adapter family.
@@ -29,6 +32,7 @@ config SCSI_QLA2322
29 tristate "QLogic ISP2322 host adapter family support" 32 tristate "QLogic ISP2322 host adapter family support"
30 depends on SCSI_QLA2XXX 33 depends on SCSI_QLA2XXX
31 select SCSI_FC_ATTRS 34 select SCSI_FC_ATTRS
35 select FW_LOADER
32 ---help--- 36 ---help---
33 This driver supports the QLogic 2322 (ISP2322) host adapter family. 37 This driver supports the QLogic 2322 (ISP2322) host adapter family.
34 38
@@ -36,6 +40,16 @@ config SCSI_QLA6312
36 tristate "QLogic ISP63xx host adapter family support" 40 tristate "QLogic ISP63xx host adapter family support"
37 depends on SCSI_QLA2XXX 41 depends on SCSI_QLA2XXX
38 select SCSI_FC_ATTRS 42 select SCSI_FC_ATTRS
43 select FW_LOADER
39 ---help--- 44 ---help---
40 This driver supports the QLogic 63xx (ISP6312 and ISP6322) host 45 This driver supports the QLogic 63xx (ISP6312 and ISP6322) host
41 adapter family. 46 adapter family.
47
48config SCSI_QLA24XX
49 tristate "QLogic ISP24xx host adapter family support"
50 depends on SCSI_QLA2XXX
51 select SCSI_FC_ATTRS
52 select FW_LOADER
53 ---help---
54 This driver supports the QLogic 24xx (ISP2422 and ISP2432) host
55 adapter family.
diff --git a/drivers/scsi/qla2xxx/Makefile b/drivers/scsi/qla2xxx/Makefile
index 00d2e3c21ef6..b169687d08ff 100644
--- a/drivers/scsi/qla2xxx/Makefile
+++ b/drivers/scsi/qla2xxx/Makefile
@@ -1,5 +1,4 @@
1EXTRA_CFLAGS += -DUNIQUE_FW_NAME 1EXTRA_CFLAGS += -DUNIQUE_FW_NAME
2EXTRA_CFLAGS += -DCONFIG_SCSI_QLA24XX -DCONFIG_SCSI_QLA24XX_MODULE
3 2
4qla2xxx-y := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o \ 3qla2xxx-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 4 qla_dbg.o qla_sup.o qla_rscn.o qla_attr.o