summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-01-08 13:55:39 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-01-08 13:55:39 -0800
commit00cd25b29ba946b7d0907157577ab5cf421bd50e (patch)
tree57d76cf7a495ea8f1ac662e12442bf6164ea3024 /drivers/net
parente2b6d02cca533715d6be40fdfc32d3cc47333358 (diff)
parentb49bfd32901625e4adcfee011d2b32a43b4db67d (diff)
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.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 1c01b96c961..2d28d58200d 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;