diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /drivers/net/znet.c | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
Diffstat (limited to 'drivers/net/znet.c')
| -rw-r--r-- | drivers/net/znet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/znet.c b/drivers/net/znet.c index ae07b3dfbcc1..ec2800ff8d42 100644 --- a/drivers/net/znet.c +++ b/drivers/net/znet.c | |||
| @@ -652,7 +652,7 @@ static irqreturn_t znet_interrupt(int irq, void *dev_id) | |||
| 652 | dev->stats.tx_errors++; | 652 | dev->stats.tx_errors++; |
| 653 | 653 | ||
| 654 | /* Transceiver may be stuck if cable | 654 | /* Transceiver may be stuck if cable |
| 655 | * was removed while emiting a | 655 | * was removed while emitting a |
| 656 | * packet. Flip it off, then on to | 656 | * packet. Flip it off, then on to |
| 657 | * reset it. This is very empirical, | 657 | * reset it. This is very empirical, |
| 658 | * but it seems to work. */ | 658 | * but it seems to work. */ |