aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/message/fusion
diff options
context:
space:
mode:
authorMoore, Eric <Eric.Moore@lsil.com>2006-01-13 18:25:26 -0500
committerJames Bottomley <jejb@mulgrave.(none)>2006-01-14 11:55:04 -0500
commit6d5b0c315e0c14f8a0fe274eda7676d62cbd8584 (patch)
treecf67da224646532670e0f9e3a7e5ecbe4e63d943 /drivers/message/fusion
parent05e8ec17f4d11ba13795e878fc389cb04d1fdadd (diff)
[SCSI] fusion - adding support for FC949ES
Add software recognition for the new LSI Logic Fibre Channel controller. Signed-off-by: Eric Moore <Eric.Moore@lsil.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/message/fusion')
-rw-r--r--drivers/message/fusion/mptbase.c4
-rw-r--r--drivers/message/fusion/mptfc.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 8c26f093fb65..33213370027e 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -1378,6 +1378,10 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
1378 ioc->bus_type = FC; 1378 ioc->bus_type = FC;
1379 ioc->errata_flag_1064 = 1; 1379 ioc->errata_flag_1064 = 1;
1380 } 1380 }
1381 else if (pdev->device == MPI_MANUFACTPAGE_DEVICEID_FC949E) {
1382 ioc->prod_name = "LSIFC949E";
1383 ioc->bus_type = FC;
1384 }
1381 else if (pdev->device == MPI_MANUFACTPAGE_DEVID_53C1030) { 1385 else if (pdev->device == MPI_MANUFACTPAGE_DEVID_53C1030) {
1382 ioc->prod_name = "LSI53C1030"; 1386 ioc->prod_name = "LSI53C1030";
1383 ioc->bus_type = SPI; 1387 ioc->bus_type = SPI;
diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c
index a380fe105a22..b102c7666d0e 100644
--- a/drivers/message/fusion/mptfc.c
+++ b/drivers/message/fusion/mptfc.c
@@ -145,6 +145,8 @@ static struct pci_device_id mptfc_pci_table[] = {
145 PCI_ANY_ID, PCI_ANY_ID }, 145 PCI_ANY_ID, PCI_ANY_ID },
146 { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC949X, 146 { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC949X,
147 PCI_ANY_ID, PCI_ANY_ID }, 147 PCI_ANY_ID, PCI_ANY_ID },
148 { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC949ES,
149 PCI_ANY_ID, PCI_ANY_ID },
148 {0} /* Terminating entry */ 150 {0} /* Terminating entry */
149}; 151};
150MODULE_DEVICE_TABLE(pci, mptfc_pci_table); 152MODULE_DEVICE_TABLE(pci, mptfc_pci_table);