aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/bnx2x/bnx2x_main.c7
-rw-r--r--drivers/scsi/bnx2i/bnx2i_init.c10
-rw-r--r--include/linux/pci_ids.h2
3 files changed, 8 insertions, 11 deletions
diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c
index 8cdcf5b39d1e..9791dc53375d 100644
--- a/drivers/net/bnx2x/bnx2x_main.c
+++ b/drivers/net/bnx2x/bnx2x_main.c
@@ -145,13 +145,6 @@ static struct {
145 { "Broadcom NetXtreme II BCM57712E XGb" } 145 { "Broadcom NetXtreme II BCM57712E XGb" }
146}; 146};
147 147
148#ifndef PCI_DEVICE_ID_NX2_57712
149#define PCI_DEVICE_ID_NX2_57712 0x1662
150#endif
151#ifndef PCI_DEVICE_ID_NX2_57712E
152#define PCI_DEVICE_ID_NX2_57712E 0x1663
153#endif
154
155static DEFINE_PCI_DEVICE_TABLE(bnx2x_pci_tbl) = { 148static DEFINE_PCI_DEVICE_TABLE(bnx2x_pci_tbl) = {
156 { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57710), BCM57710 }, 149 { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57710), BCM57710 },
157 { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57711), BCM57711 }, 150 { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57711), BCM57711 },
diff --git a/drivers/scsi/bnx2i/bnx2i_init.c b/drivers/scsi/bnx2i/bnx2i_init.c
index 6afaa34222af..5ef01c98f48e 100644
--- a/drivers/scsi/bnx2i/bnx2i_init.c
+++ b/drivers/scsi/bnx2i/bnx2i_init.c
@@ -29,7 +29,7 @@ static char version[] __devinitdata =
29MODULE_AUTHOR("Anil Veerabhadrappa <anilgv@broadcom.com> and " 29MODULE_AUTHOR("Anil Veerabhadrappa <anilgv@broadcom.com> and "
30 "Eddie Wai <eddie.wai@broadcom.com>"); 30 "Eddie Wai <eddie.wai@broadcom.com>");
31 31
32MODULE_DESCRIPTION("Broadcom NetXtreme II BCM5706/5708/5709/57710/57711" 32MODULE_DESCRIPTION("Broadcom NetXtreme II BCM5706/5708/5709/57710/57711/57712"
33 " iSCSI Driver"); 33 " iSCSI Driver");
34MODULE_LICENSE("GPL"); 34MODULE_LICENSE("GPL");
35MODULE_VERSION(DRV_MODULE_VERSION); 35MODULE_VERSION(DRV_MODULE_VERSION);
@@ -88,9 +88,11 @@ void bnx2i_identify_device(struct bnx2i_hba *hba)
88 (hba->pci_did == PCI_DEVICE_ID_NX2_5709S)) { 88 (hba->pci_did == PCI_DEVICE_ID_NX2_5709S)) {
89 set_bit(BNX2I_NX2_DEV_5709, &hba->cnic_dev_type); 89 set_bit(BNX2I_NX2_DEV_5709, &hba->cnic_dev_type);
90 hba->mail_queue_access = BNX2I_MQ_BIN_MODE; 90 hba->mail_queue_access = BNX2I_MQ_BIN_MODE;
91 } else if (hba->pci_did == PCI_DEVICE_ID_NX2_57710 || 91 } else if (hba->pci_did == PCI_DEVICE_ID_NX2_57710 ||
92 hba->pci_did == PCI_DEVICE_ID_NX2_57711 || 92 hba->pci_did == PCI_DEVICE_ID_NX2_57711 ||
93 hba->pci_did == PCI_DEVICE_ID_NX2_57711E) 93 hba->pci_did == PCI_DEVICE_ID_NX2_57711E ||
94 hba->pci_did == PCI_DEVICE_ID_NX2_57712 ||
95 hba->pci_did == PCI_DEVICE_ID_NX2_57712E)
94 set_bit(BNX2I_NX2_DEV_57710, &hba->cnic_dev_type); 96 set_bit(BNX2I_NX2_DEV_57710, &hba->cnic_dev_type);
95 else 97 else
96 printk(KERN_ALERT "bnx2i: unknown device, 0x%x\n", 98 printk(KERN_ALERT "bnx2i: unknown device, 0x%x\n",
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 3adb06ebf841..f82986b4f44a 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2078,6 +2078,8 @@
2078#define PCI_DEVICE_ID_TIGON3_5723 0x165b 2078#define PCI_DEVICE_ID_TIGON3_5723 0x165b
2079#define PCI_DEVICE_ID_TIGON3_5705M 0x165d 2079#define PCI_DEVICE_ID_TIGON3_5705M 0x165d
2080#define PCI_DEVICE_ID_TIGON3_5705M_2 0x165e 2080#define PCI_DEVICE_ID_TIGON3_5705M_2 0x165e
2081#define PCI_DEVICE_ID_NX2_57712 0x1662
2082#define PCI_DEVICE_ID_NX2_57712E 0x1663
2081#define PCI_DEVICE_ID_TIGON3_5714 0x1668 2083#define PCI_DEVICE_ID_TIGON3_5714 0x1668
2082#define PCI_DEVICE_ID_TIGON3_5714S 0x1669 2084#define PCI_DEVICE_ID_TIGON3_5714S 0x1669
2083#define PCI_DEVICE_ID_TIGON3_5780 0x166a 2085#define PCI_DEVICE_ID_TIGON3_5780 0x166a