Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 286711
b: refs/heads/master
c: 5437f4b
h: refs/heads/master
i:
  286709: c2ea303
  286707: a95a2f0
  286703: dc570ce
v: v3
  • Loading branch information
Alessandro Rubini authored and David S. Miller committed Jan 24, 2012
1 parent adaba2c commit 4d76986
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: 56ac11cf2f21366ad48b356f7a0d1af8cff3588e
refs/heads/master: 5437f4b2576f1763a27bc4c0e7f7c280220ba1aa
6 changes: 3 additions & 3 deletions trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,9 @@ static int stmmac_pci_resume(struct pci_dev *pdev)
#define STMMAC_DEVICE_ID 0x1108

static DEFINE_PCI_DEVICE_TABLE(stmmac_id_table) = {
{
PCI_DEVICE(STMMAC_VENDOR_ID, STMMAC_DEVICE_ID)}, {
}
{PCI_DEVICE(STMMAC_VENDOR_ID, STMMAC_DEVICE_ID)},
{PCI_DEVICE(PCI_VENDOR_ID_STMICRO, PCI_DEVICE_ID_STMICRO_MAC)},
{}
};

MODULE_DEVICE_TABLE(pci, stmmac_id_table);
Expand Down

0 comments on commit 4d76986

Please sign in to comment.