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/stmmac/norm_desc.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/stmmac/norm_desc.c')
| -rw-r--r-- | drivers/net/stmmac/norm_desc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/stmmac/norm_desc.c b/drivers/net/stmmac/norm_desc.c index cd0cc76f7a1c..029c2a2cf524 100644 --- a/drivers/net/stmmac/norm_desc.c +++ b/drivers/net/stmmac/norm_desc.c | |||
| @@ -67,7 +67,7 @@ static int ndesc_get_tx_len(struct dma_desc *p) | |||
| 67 | 67 | ||
| 68 | /* This function verifies if each incoming frame has some errors | 68 | /* This function verifies if each incoming frame has some errors |
| 69 | * and, if required, updates the multicast statistics. | 69 | * and, if required, updates the multicast statistics. |
| 70 | * In case of success, it returns csum_none becasue the device | 70 | * In case of success, it returns csum_none because the device |
| 71 | * is not able to compute the csum in HW. */ | 71 | * is not able to compute the csum in HW. */ |
| 72 | static int ndesc_get_rx_status(void *data, struct stmmac_extra_stats *x, | 72 | static int ndesc_get_rx_status(void *data, struct stmmac_extra_stats *x, |
| 73 | struct dma_desc *p) | 73 | struct dma_desc *p) |