diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-02 03:32:56 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-02 03:32:56 -0400 |
| commit | 6cdee2f96a97f6da26bd3759c3f8823332fbb438 (patch) | |
| tree | ec79086f05ffc3bdf1aecc37e108ccfc3a95450d /drivers/net/via-velocity.c | |
| parent | 0625491493d9000e4556bf566d205c28c8e7dc4e (diff) | |
| parent | 2fbd3da3877ad8d923b055e5996f80b4d4a6daf4 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/yellowfin.c
Diffstat (limited to 'drivers/net/via-velocity.c')
| -rw-r--r-- | drivers/net/via-velocity.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c index e56cf6b548d6..ced1446dec04 100644 --- a/drivers/net/via-velocity.c +++ b/drivers/net/via-velocity.c | |||
| @@ -1789,7 +1789,7 @@ static void velocity_error(struct velocity_info *vptr, int status) | |||
| 1789 | * mode | 1789 | * mode |
| 1790 | */ | 1790 | */ |
| 1791 | if (vptr->rev_id < REV_ID_VT3216_A0) { | 1791 | if (vptr->rev_id < REV_ID_VT3216_A0) { |
| 1792 | if (vptr->mii_status | VELOCITY_DUPLEX_FULL) | 1792 | if (vptr->mii_status & VELOCITY_DUPLEX_FULL) |
| 1793 | BYTE_REG_BITS_ON(TCR_TB2BDIS, ®s->TCR); | 1793 | BYTE_REG_BITS_ON(TCR_TB2BDIS, ®s->TCR); |
| 1794 | else | 1794 | else |
| 1795 | BYTE_REG_BITS_OFF(TCR_TB2BDIS, ®s->TCR); | 1795 | BYTE_REG_BITS_OFF(TCR_TB2BDIS, ®s->TCR); |