diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-26 07:22:13 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-26 07:22:13 -0500 |
| commit | 4434e5156409eb3ec98f5ad7f0a0c07ebafe970d (patch) | |
| tree | c7f148cdae7a6cf4013253c6c2dbd1c49e837e32 /drivers/net/sundance.c | |
| parent | 2b8f836fb196acede88b6cc772e9057e0a9c0223 (diff) | |
| parent | 694593e3374a67d95ece6a275a1f181644c2c4d8 (diff) | |
Merge branches 'sched/cleanups', 'sched/urgent' and 'linus' into sched/core
Diffstat (limited to 'drivers/net/sundance.c')
| -rw-r--r-- | drivers/net/sundance.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c index feaf0e0577d7..43695b76606f 100644 --- a/drivers/net/sundance.c +++ b/drivers/net/sundance.c | |||
| @@ -909,7 +909,7 @@ static void check_duplex(struct net_device *dev) | |||
| 909 | printk(KERN_INFO "%s: Setting %s-duplex based on MII #%d " | 909 | printk(KERN_INFO "%s: Setting %s-duplex based on MII #%d " |
| 910 | "negotiated capability %4.4x.\n", dev->name, | 910 | "negotiated capability %4.4x.\n", dev->name, |
| 911 | duplex ? "full" : "half", np->phys[0], negotiated); | 911 | duplex ? "full" : "half", np->phys[0], negotiated); |
| 912 | iowrite16(ioread16(ioaddr + MACCtrl0) | duplex ? 0x20 : 0, ioaddr + MACCtrl0); | 912 | iowrite16(ioread16(ioaddr + MACCtrl0) | (duplex ? 0x20 : 0), ioaddr + MACCtrl0); |
| 913 | } | 913 | } |
| 914 | } | 914 | } |
| 915 | 915 | ||