diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-03-08 11:49:24 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-03-08 11:49:24 -0500 |
| commit | 9446389ef612096704fdf18fa79bab423d4110f0 (patch) | |
| tree | 3e4fda7270be58ae176d20d318e61fb115b325b5 /drivers/net/macb.c | |
| parent | cdd0972945dbcb8ea24db365d9b0e100af2a27bb (diff) | |
| parent | 84c6f6046c5a2189160a8f0dca8b90427bf690ea (diff) | |
Merge commit 'origin' into devel
Diffstat (limited to 'drivers/net/macb.c')
| -rw-r--r-- | drivers/net/macb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 81bf005ff280..1d210ed46130 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c | |||
| @@ -148,7 +148,7 @@ static void macb_handle_link_change(struct net_device *dev) | |||
| 148 | 148 | ||
| 149 | if (phydev->duplex) | 149 | if (phydev->duplex) |
| 150 | reg |= MACB_BIT(FD); | 150 | reg |= MACB_BIT(FD); |
| 151 | if (phydev->speed) | 151 | if (phydev->speed == SPEED_100) |
| 152 | reg |= MACB_BIT(SPD); | 152 | reg |= MACB_BIT(SPD); |
| 153 | 153 | ||
| 154 | macb_writel(bp, NCFGR, reg); | 154 | macb_writel(bp, NCFGR, reg); |