diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-15 06:02:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-15 06:02:23 -0400 |
| commit | 9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb (patch) | |
| tree | 8d104ec2a459346b99413b0b77421ca7b9936c1a /drivers/net/e100.c | |
| parent | ca44d6e60f9de26281fda203f58b570e1748c015 (diff) | |
| parent | 45e3e1935e2857c54783291107d33323b3ef33c8 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/scsi/fcoe/fcoe.c
net/core/drop_monitor.c
net/core/net-traces.c
Diffstat (limited to 'drivers/net/e100.c')
| -rw-r--r-- | drivers/net/e100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index e52a2018e91e..f7929e89eb03 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c | |||
| @@ -2921,7 +2921,7 @@ static int e100_resume(struct pci_dev *pdev) | |||
| 2921 | /* ack any pending wake events, disable PME */ | 2921 | /* ack any pending wake events, disable PME */ |
| 2922 | pci_enable_wake(pdev, 0, 0); | 2922 | pci_enable_wake(pdev, 0, 0); |
| 2923 | 2923 | ||
| 2924 | /* disbale reverse auto-negotiation */ | 2924 | /* disable reverse auto-negotiation */ |
| 2925 | if (nic->phy == phy_82552_v) { | 2925 | if (nic->phy == phy_82552_v) { |
| 2926 | u16 smartspeed = mdio_read(netdev, nic->mii.phy_id, | 2926 | u16 smartspeed = mdio_read(netdev, nic->mii.phy_id, |
| 2927 | E100_82552_SMARTSPEED); | 2927 | E100_82552_SMARTSPEED); |