diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-01 15:12:56 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-01 15:12:56 +0200 |
| commit | b262e60309e1b0eb25d300c7e739427d5316abb1 (patch) | |
| tree | bf319d78c79bb5cb617ff0c8340c73aa349bba15 /drivers/net/e100.c | |
| parent | ipv6: almost identical frag hashing funcs combined (diff) | |
| parent | af_key: Free dumping state on socket close (diff) | |
| download | linux-b262e60309e1b0eb25d300c7e739427d5316abb1.tar.xz linux-b262e60309e1b0eb25d300c7e739427d5316abb1.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath9k/core.c
drivers/net/wireless/ath9k/main.c
net/core/dev.c
Diffstat (limited to 'drivers/net/e100.c')
| -rw-r--r-- | drivers/net/e100.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index 7d7dfa512bfa..3d69fae781cf 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c @@ -2738,9 +2738,7 @@ static int __devinit e100_probe(struct pci_dev *pdev, nic->flags |= wol_magic; /* ack any pending wake events, disable PME */ - err = pci_enable_wake(pdev, 0, 0); - if (err) - DPRINTK(PROBE, ERR, "Error clearing wake event\n"); + pci_pme_active(pdev, false); strcpy(netdev->name, "eth%d"); if((err = register_netdev(netdev))) { |