From 1f983ef781280a1595d29d2e3c6c6156a57d2633 Mon Sep 17 00:00:00 2001 From: Linas Vepstas Date: Wed, 27 Sep 2006 12:54:11 -0700 Subject: [PATCH] --- yaml --- r: 37962 b: refs/heads/master c: dbf38c9474306297866d9c2af02c2d37c5165325 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000/e1000_main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3aeff2c5bec4..9d1f08c9dfc6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4666560a37dfdc748ae7c1d9f09c7b6ff03ce899 +refs/heads/master: dbf38c9474306297866d9c2af02c2d37c5165325 diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c index 593bfbeef8d4..d5e8fd5a69f2 100644 --- a/trunk/drivers/net/e1000/e1000_main.c +++ b/trunk/drivers/net/e1000/e1000_main.c @@ -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)