diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/atm/ambassador.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
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 9f47e862526..a5fcb1eb862 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 | ||