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/atm/ambassador.c | |
| parent | 6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff) | |
| parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) | |
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'drivers/atm/ambassador.c')
| -rw-r--r-- | drivers/atm/ambassador.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c index 9f47e8625266..a5fcb1eb862f 100644 --- a/drivers/atm/ambassador.c +++ b/drivers/atm/ambassador.c | |||
| @@ -497,7 +497,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) { | |||
| 497 | // VC layer stats | 497 | // VC layer stats |
| 498 | atomic_inc(&atm_vcc->stats->rx); | 498 | atomic_inc(&atm_vcc->stats->rx); |
| 499 | __net_timestamp(skb); | 499 | __net_timestamp(skb); |
| 500 | // end of our responsability | 500 | // end of our responsibility |
| 501 | atm_vcc->push (atm_vcc, skb); | 501 | atm_vcc->push (atm_vcc, skb); |
| 502 | return; | 502 | return; |
| 503 | 503 | ||