diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
tree | e01a457a4912a8553bc65524aa3125d51f29f810 /drivers/net/eth16i.c | |
parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) |
Merge with Linux 2.2.1.
Diffstat (limited to 'drivers/net/eth16i.c')
-rw-r--r-- | drivers/net/eth16i.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/eth16i.c b/drivers/net/eth16i.c index 59921bfc2..391f6194a 100644 --- a/drivers/net/eth16i.c +++ b/drivers/net/eth16i.c @@ -799,12 +799,12 @@ static int eth16i_receive_probe_packet(int ioaddr) if( (jiffies - starttime) > TX_TIMEOUT) { if(eth16i_debug > 1) - printk(KERN_DEBUG "Timeout occured waiting transmit packet received\n"); + printk(KERN_DEBUG "Timeout occurred waiting transmit packet received\n"); starttime = jiffies; while((inb(ioaddr + RX_STATUS_REG) & 0x80) == 0) { if( (jiffies - starttime) > TX_TIMEOUT) { if(eth16i_debug > 1) - printk(KERN_DEBUG "Timeout occured waiting receive packet\n"); + printk(KERN_DEBUG "Timeout occurred waiting receive packet\n"); return -1; } } |