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/typhoon.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/typhoon.c')
| -rw-r--r-- | drivers/net/typhoon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c index 7fa5ec2de942..82653cb07857 100644 --- a/drivers/net/typhoon.c +++ b/drivers/net/typhoon.c | |||
| @@ -846,7 +846,7 @@ typhoon_start_tx(struct sk_buff *skb, struct net_device *dev) | |||
| 846 | if(typhoon_num_free_tx(txRing) < (numDesc + 2)) { | 846 | if(typhoon_num_free_tx(txRing) < (numDesc + 2)) { |
| 847 | netif_stop_queue(dev); | 847 | netif_stop_queue(dev); |
| 848 | 848 | ||
| 849 | /* A Tx complete IRQ could have gotten inbetween, making | 849 | /* A Tx complete IRQ could have gotten between, making |
| 850 | * the ring free again. Only need to recheck here, since | 850 | * the ring free again. Only need to recheck here, since |
| 851 | * Tx is serialized. | 851 | * Tx is serialized. |
| 852 | */ | 852 | */ |