linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / scsi / qla2xxx / ql2300.c

diff --git a/drivers/scsi/qla2xxx/ql2300.c b/drivers/scsi/qla2xxx/ql2300.c
index e7a93dd..fd2f4b7 100644 (file)
--- a/drivers/scsi/qla2xxx/ql2300.c
+++ b/drivers/scsi/qla2xxx/ql2300.c
@@ -40,11 +40,6 @@ static struct qla_board_info qla_board_tbl[] = {
                .isp_name       = "ISP2312",
                .fw_info        = qla_fw_tbl,
        },
-       {
-               .drv_name       = qla_driver_name,
-               .isp_name       = "ISP6312",
-               .fw_info        = qla_fw_tbl,
-       },
 };
 
 static struct pci_device_id qla2300_pci_tbl[] = {
@@ -62,13 +57,6 @@ static struct pci_device_id qla2300_pci_tbl[] = {
                .subdevice      = PCI_ANY_ID,
                .driver_data    = (unsigned long)&qla_board_tbl[1],
        },
-       {
-               .vendor         = PCI_VENDOR_ID_QLOGIC,
-               .device         = PCI_DEVICE_ID_QLOGIC_ISP6312,
-               .subvendor      = PCI_ANY_ID,
-               .subdevice      = PCI_ANY_ID,
-               .driver_data    = (unsigned long)&qla_board_tbl[2],
-       },
        {0, 0},
 };
 MODULE_DEVICE_TABLE(pci, qla2300_pci_tbl);