aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/qla2xxx/ql2322.c
diff options
context:
space:
mode:
authorandrew.vasquez@qlogic.com <andrew.vasquez@qlogic.com>2006-03-09 17:27:18 -0500
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-03-12 10:38:22 -0500
commit48c02fde949f15920c0018d33d285fd39730d24b (patch)
treeaded9282ed2e45b0d0c9e73c95cfd60cfbadfba7 /drivers/scsi/qla2xxx/ql2322.c
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/ql2322.c')
-rw-r--r--drivers/scsi/qla2xxx/ql2322.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/scsi/qla2xxx/ql2322.c b/drivers/scsi/qla2xxx/ql2322.c
index c88a22c0d93a..3c8cafc12eee 100644
--- a/drivers/scsi/qla2xxx/ql2322.c
+++ b/drivers/scsi/qla2xxx/ql2322.c
@@ -52,6 +52,11 @@ static struct qla_board_info qla_board_tbl[] = {
52 .isp_name = "ISP2322", 52 .isp_name = "ISP2322",
53 .fw_info = qla_fw_tbl, 53 .fw_info = qla_fw_tbl,
54 }, 54 },
55 {
56 .drv_name = qla_driver_name,
57 .isp_name = "ISP6322",
58 .fw_info = qla_fw_tbl,
59 },
55}; 60};
56 61
57static struct pci_device_id qla2322_pci_tbl[] = { 62static struct pci_device_id qla2322_pci_tbl[] = {
@@ -62,6 +67,13 @@ static struct pci_device_id qla2322_pci_tbl[] = {
62 .subdevice = PCI_ANY_ID, 67 .subdevice = PCI_ANY_ID,
63 .driver_data = (unsigned long)&qla_board_tbl[0], 68 .driver_data = (unsigned long)&qla_board_tbl[0],
64 }, 69 },
70 {
71 .vendor = PCI_VENDOR_ID_QLOGIC,
72 .device = PCI_DEVICE_ID_QLOGIC_ISP6322,
73 .subvendor = PCI_ANY_ID,
74 .subdevice = PCI_ANY_ID,
75 .driver_data = (unsigned long)&qla_board_tbl[1],
76 },
65 {0, 0}, 77 {0, 0},
66}; 78};
67MODULE_DEVICE_TABLE(pci, qla2322_pci_tbl); 79MODULE_DEVICE_TABLE(pci, qla2322_pci_tbl);