diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-12-09 08:24:25 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-12-09 08:24:57 +0100 |
| commit | 4c68db38c85188824b21698842b42a62b4f78657 (patch) | |
| tree | 3ee1c3b22af6713adf669a3bb452ce82bc7fe495 /drivers/net/bmac.c | |
| parent | 5c0e9f28da84c68ce0ae68b7a75faaf862e156e2 (diff) | |
| parent | 2b876f95d03e226394b5d360c86127cbefaf614b (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: We want to queue up a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 406f0642425..9b587c34419 100644 --- a/drivers/net/bmac.c +++ b/drivers/net/bmac.c @@ -438,8 +438,8 @@ bmac_init_phy(struct net_device *dev) ctrl = bmac_mif_read(dev, 0); capable = ((bmac_mif_read(dev, 1) & 0xf800) >> 6) | 1; - if (bmac_mif_read(dev, 4) != capable - || (ctrl & 0x1000) == 0) { + if (bmac_mif_read(dev, 4) != capable || + (ctrl & 0x1000) == 0) { bmac_mif_write(dev, 4, capable); bmac_mif_write(dev, 0, 0x1200); } else |