diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-23 01:45:46 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-23 01:45:46 -0500 |
| commit | 6be325719b3e54624397e413efd4b33a997e55a3 (patch) | |
| tree | 57f321a56794cab2222e179b16731e0d76a4a68a /drivers/net/sky2.c | |
| parent | 26d92f9276a56d55511a427fb70bd70886af647a (diff) | |
| parent | 92dcffb916d309aa01778bf8963a6932e4014d07 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/net/sky2.c')
| -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 7650f739a81a..37f486b65f63 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
| @@ -4685,6 +4685,7 @@ static int __devinit sky2_probe(struct pci_dev *pdev, | |||
| 4685 | INIT_WORK(&hw->restart_work, sky2_restart); | 4685 | INIT_WORK(&hw->restart_work, sky2_restart); |
| 4686 | 4686 | ||
| 4687 | pci_set_drvdata(pdev, hw); | 4687 | pci_set_drvdata(pdev, hw); |
| 4688 | pdev->d3_delay = 150; | ||
| 4688 | 4689 | ||
| 4689 | return 0; | 4690 | return 0; |
| 4690 | 4691 | ||