Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 103515
b: refs/heads/master
c: 7bb0a04
h: refs/heads/master
i:
  103513: 84d9a6c
  103511: 5786111
v: v3
  • Loading branch information
Michael Chan authored and David S. Miller committed Jul 15, 2008
1 parent 0189630 commit 39d1acd
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d6b14486953d0e8d1c57db29bf6104cea198b884
refs/heads/master: 7bb0a04fcd610e5db59690332b2a46b6068c8bc3
6 changes: 5 additions & 1 deletion trunk/drivers/net/bnx2.c
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ typedef enum {
BCM5708S,
BCM5709,
BCM5709S,
BCM5716,
} board_t;

/* indexed by board_t, above */
Expand All @@ -102,9 +103,10 @@ static struct {
{ "Broadcom NetXtreme II BCM5708 1000Base-SX" },
{ "Broadcom NetXtreme II BCM5709 1000Base-T" },
{ "Broadcom NetXtreme II BCM5709 1000Base-SX" },
{ "Broadcom NetXtreme II BCM5716 1000Base-T" },
};

static struct pci_device_id bnx2_pci_tbl[] = {
static DEFINE_PCI_DEVICE_TABLE(bnx2_pci_tbl) = {
{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5706,
PCI_VENDOR_ID_HP, 0x3101, 0, 0, NC370T },
{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5706,
Expand All @@ -123,6 +125,8 @@ static struct pci_device_id bnx2_pci_tbl[] = {
PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5709 },
{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5709S,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5709S },
{ PCI_VENDOR_ID_BROADCOM, 0x163b,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5716 },
{ 0, }
};

Expand Down

0 comments on commit 39d1acd

Please sign in to comment.