diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-09-25 08:51:50 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-25 08:51:50 -0400 |
| commit | e5baa396af7560382d2cf3f0871d616b61fc284c (patch) | |
| tree | 6afc166894b8c8b3b2cf6add72a726be14ae2443 /drivers/net/8390.c | |
| parent | d6a4c847e43c851cc0ddf73087a730227223f989 (diff) | |
| parent | ef6bd6eb90ad72ee8ee7ba8b271f27102e9a90c1 (diff) | |
Merge from Linus' tree.
Diffstat (limited to 'drivers/net/8390.c')
| -rw-r--r-- | drivers/net/8390.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/8390.c b/drivers/net/8390.c index 6d76f3a99b17..f87027420081 100644 --- a/drivers/net/8390.c +++ b/drivers/net/8390.c | |||
| @@ -1094,7 +1094,7 @@ static void NS8390_trigger_send(struct net_device *dev, unsigned int length, | |||
| 1094 | 1094 | ||
| 1095 | outb_p(E8390_NODMA+E8390_PAGE0, e8390_base+E8390_CMD); | 1095 | outb_p(E8390_NODMA+E8390_PAGE0, e8390_base+E8390_CMD); |
| 1096 | 1096 | ||
| 1097 | if (inb_p(e8390_base) & E8390_TRANS) | 1097 | if (inb_p(e8390_base + E8390_CMD) & E8390_TRANS) |
| 1098 | { | 1098 | { |
| 1099 | printk(KERN_WARNING "%s: trigger_send() called with the transmitter busy.\n", | 1099 | printk(KERN_WARNING "%s: trigger_send() called with the transmitter busy.\n", |
| 1100 | dev->name); | 1100 | dev->name); |