diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
| commit | 42933bac11e811f02200c944d8562a15f8ec4ff0 (patch) | |
| tree | fcdd9afe56eb0e746565ddd1f92f22d36678b843 /drivers/net/znet.c | |
| parent | 2b9accbee563f535046ff2cd382d0acaa92e130c (diff) | |
| parent | 25985edcedea6396277003854657b5f3cb31a628 (diff) | |
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
Fix common misspellings
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. */ |