diff options
| author | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-11 13:24:45 -0400 |
|---|---|---|
| committer | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-11 13:24:45 -0400 |
| commit | 438145c7ef5c9445f25bb8fc4d52e2c9d11fdc7c (patch) | |
| tree | 76941991e36f4a32bf1be0db3854959053f24619 /drivers/dma | |
| parent | 9ddd1b8ad8abd321964b8add5581910de6d67c2a (diff) | |
Update from 2.6.36 to 2.6.36.4wip-dissipation-jerickso
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/mv_xor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c index 411d5bf50fc4..a25f5f61e0e0 100644 --- a/drivers/dma/mv_xor.c +++ b/drivers/dma/mv_xor.c | |||
| @@ -449,7 +449,7 @@ mv_xor_slot_cleanup(struct mv_xor_chan *mv_chan) | |||
| 449 | static void mv_xor_tasklet(unsigned long data) | 449 | static void mv_xor_tasklet(unsigned long data) |
| 450 | { | 450 | { |
| 451 | struct mv_xor_chan *chan = (struct mv_xor_chan *) data; | 451 | struct mv_xor_chan *chan = (struct mv_xor_chan *) data; |
| 452 | __mv_xor_slot_cleanup(chan); | 452 | mv_xor_slot_cleanup(chan); |
| 453 | } | 453 | } |
| 454 | 454 | ||
| 455 | static struct mv_xor_desc_slot * | 455 | static struct mv_xor_desc_slot * |