commit 6cdee2f96a97f6da26bd3759c3f8823332fbb438
author David S. Miller <davem@davemloft.net> Wed Sep 02 00:32:56 2009 -0700
committer David S. Miller <davem@davemloft.net> Wed Sep 02 00:32:56 2009 -0700
tree ec79086f05ffc3bdf1aecc37e108ccfc3a95450d
parent 0625491493d9000e4556bf566d205c28c8e7dc4e
parent 2fbd3da3877ad8d923b055e5996f80b4d4a6daf4

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/yellowfin.c

drivers/net/via-velocity.c

diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index e56cf6b..ced1446 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -1789,7 +1789,7 @@
 			 *	 mode
 			 */
 			if (vptr->rev_id < REV_ID_VT3216_A0) {
-				if (vptr->mii_status | VELOCITY_DUPLEX_FULL)
+				if (vptr->mii_status & VELOCITY_DUPLEX_FULL)
 					BYTE_REG_BITS_ON(TCR_TB2BDIS, &regs->TCR);
 				else
 					BYTE_REG_BITS_OFF(TCR_TB2BDIS, &regs->TCR);