diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-08 22:55:39 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-08 22:55:39 +0100 |
| commit | 00cd25b29ba946b7d0907157577ab5cf421bd50e (patch) | |
| tree | 57d76cf7a495ea8f1ac662e12442bf6164ea3024 /drivers/net | |
| parent | Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 (diff) | |
| parent | PCIe AER: prevent AER injection if hardware masks error reporting (diff) | |
| download | linux-00cd25b29ba946b7d0907157577ab5cf421bd50e.tar.xz linux-00cd25b29ba946b7d0907157577ab5cf421bd50e.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
PCIe AER: prevent AER injection if hardware masks error reporting
PCI/PM: Use per-device D3 delays
PCI: Check the node argument passed to cpumask_of_node
PCI: AER: fix aer inject result in kernel oops
PCI: pcie portdrv: style cleanup
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/sky2.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 1c01b96c9611..2d28d58200d0 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -4684,6 +4684,7 @@ static int __devinit sky2_probe(struct pci_dev *pdev, INIT_WORK(&hw->restart_work, sky2_restart); pci_set_drvdata(pdev, hw); + pdev->d3_delay = 150; return 0; |