diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
| commit | fac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch) | |
| tree | 1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /drivers/net/znet.c | |
| parent | 6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff) | |
| parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) | |
Merge commit 'v2.6.39-rc3' into for-2.6.39
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. */ |