diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /drivers/net/znet.c | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
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. */ |