diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /drivers/net/bmac.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/net/bmac.c')
| -rw-r--r-- | drivers/net/bmac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c index 406f06424251..9b587c344194 100644 --- a/drivers/net/bmac.c +++ b/drivers/net/bmac.c | |||
| @@ -438,8 +438,8 @@ bmac_init_phy(struct net_device *dev) | |||
| 438 | 438 | ||
| 439 | ctrl = bmac_mif_read(dev, 0); | 439 | ctrl = bmac_mif_read(dev, 0); |
| 440 | capable = ((bmac_mif_read(dev, 1) & 0xf800) >> 6) | 1; | 440 | capable = ((bmac_mif_read(dev, 1) & 0xf800) >> 6) | 1; |
| 441 | if (bmac_mif_read(dev, 4) != capable | 441 | if (bmac_mif_read(dev, 4) != capable || |
| 442 | || (ctrl & 0x1000) == 0) { | 442 | (ctrl & 0x1000) == 0) { |
| 443 | bmac_mif_write(dev, 4, capable); | 443 | bmac_mif_write(dev, 4, capable); |
| 444 | bmac_mif_write(dev, 0, 0x1200); | 444 | bmac_mif_write(dev, 0, 0x1200); |
| 445 | } else | 445 | } else |