Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 37962
b: refs/heads/master
c: dbf38c9
h: refs/heads/master
v: v3
  • Loading branch information
Linas Vepstas authored and Auke Kok committed Sep 27, 2006
1 parent b1914fb commit 1f983ef
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 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: 4666560a37dfdc748ae7c1d9f09c7b6ff03ce899
refs/heads/master: dbf38c9474306297866d9c2af02c2d37c5165325
4 changes: 2 additions & 2 deletions trunk/drivers/net/e1000/e1000_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -4912,8 +4912,8 @@ static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev)
}
pci_set_master(pdev);

pci_enable_wake(pdev, 3, 0);
pci_enable_wake(pdev, 4, 0); /* 4 == D3 cold */
pci_enable_wake(pdev, PCI_D3hot, 0);
pci_enable_wake(pdev, PCI_D3cold, 0);

/* Perform card reset only on one instance of the card */
if (PCI_FUNC (pdev->devfn) != 0)
Expand Down

0 comments on commit 1f983ef

Please sign in to comment.