git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...
[pandora-kernel.git]
/
drivers
/
net
/
arcnet
/
com20020.c
diff --git
a/drivers/net/arcnet/com20020.c
b/drivers/net/arcnet/com20020.c
index
4218075
..
7cf0a25
100644
(file)
--- a/
drivers/net/arcnet/com20020.c
+++ b/
drivers/net/arcnet/com20020.c
@@
-104,7
+104,7
@@
int com20020_check(struct net_device *dev)
SET_SUBADR(SUB_SETUP1);
outb(lp->setup, _XREG);
- if (lp->c
ard_flags & ARC_CAN_10MBIT
)
+ if (lp->c
lockm != 0
)
{
SET_SUBADR(SUB_SETUP2);
outb(lp->setup2, _XREG);