diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-19 02:38:23 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-19 02:38:23 -0500 |
| commit | 198d6ba4d7f48c94f990f4604f0b3d73925e0ded (patch) | |
| tree | 56bbdf8ba2553c23c8099da9344a8f1d1aba97ab /drivers/net/e1000/e1000_main.c | |
| parent | 9a57f7fabd383920585ed8b74eacd117c6551f2d (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/isdn/i4l/isdn_net.c
fs/cifs/connect.c
Diffstat (limited to 'drivers/net/e1000/e1000_main.c')
| -rw-r--r-- | drivers/net/e1000/e1000_main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 7dd4ded13d97..dd8343244378 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
| @@ -1175,6 +1175,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev, | |||
| 1175 | 1175 | ||
| 1176 | /* initialize the wol settings based on the eeprom settings */ | 1176 | /* initialize the wol settings based on the eeprom settings */ |
| 1177 | adapter->wol = adapter->eeprom_wol; | 1177 | adapter->wol = adapter->eeprom_wol; |
| 1178 | device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol); | ||
| 1178 | 1179 | ||
| 1179 | /* print bus type/speed/width info */ | 1180 | /* print bus type/speed/width info */ |
| 1180 | DPRINTK(PROBE, INFO, "(PCI%s:%s:%s) ", | 1181 | DPRINTK(PROBE, INFO, "(PCI%s:%s:%s) ", |