Merge branch 'master' of /usr/src/ntfs-2.6/

[linux-2.6-omap-h63xx.git] / drivers / scsi / qla2xxx / ql2322.c

diff --git a/drivers/scsi/qla2xxx/ql2322.c b/drivers/scsi/qla2xxx/ql2322.c
index c88a22c0d93ade82416d0bb66c8a48d1f2897fe2..3c8cafc12eee4a20533db0eb41bba4e261ec8a46 100644 (file)
--- a/drivers/scsi/qla2xxx/ql2322.c
+++ b/drivers/scsi/qla2xxx/ql2322.c
@@ -52,6 +52,11 @@ static struct qla_board_info qla_board_tbl[] = {
                .isp_name       = "ISP2322",
                .fw_info        = qla_fw_tbl,
        },
+       {
+               .drv_name       = qla_driver_name,
+               .isp_name       = "ISP6322",
+               .fw_info        = qla_fw_tbl,
+       },
 };
 
 static struct pci_device_id qla2322_pci_tbl[] = {
@@ -62,6 +67,13 @@ static struct pci_device_id qla2322_pci_tbl[] = {
                .subdevice      = PCI_ANY_ID,
                .driver_data    = (unsigned long)&qla_board_tbl[0],
        },
+       {
+               .vendor         = PCI_VENDOR_ID_QLOGIC,
+               .device         = PCI_DEVICE_ID_QLOGIC_ISP6322,
+               .subvendor      = PCI_ANY_ID,
+               .subdevice      = PCI_ANY_ID,
+               .driver_data    = (unsigned long)&qla_board_tbl[1],
+       },
        {0, 0},
 };
 MODULE_DEVICE_TABLE(pci, qla2322_pci_tbl);