diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
| commit | 42933bac11e811f02200c944d8562a15f8ec4ff0 (patch) | |
| tree | fcdd9afe56eb0e746565ddd1f92f22d36678b843 /drivers/dma/coh901318.c | |
| parent | 2b9accbee563f535046ff2cd382d0acaa92e130c (diff) | |
| parent | 25985edcedea6396277003854657b5f3cb31a628 (diff) | |
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
Fix common misspellings
Diffstat (limited to 'drivers/dma/coh901318.c')
| -rw-r--r-- | drivers/dma/coh901318.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/coh901318.c b/drivers/dma/coh901318.c index 00deabd9a04b..f48e54006518 100644 --- a/drivers/dma/coh901318.c +++ b/drivers/dma/coh901318.c | |||
| @@ -529,7 +529,7 @@ static void coh901318_pause(struct dma_chan *chan) | |||
| 529 | val = readl(virtbase + COH901318_CX_CFG + | 529 | val = readl(virtbase + COH901318_CX_CFG + |
| 530 | COH901318_CX_CFG_SPACING * channel); | 530 | COH901318_CX_CFG_SPACING * channel); |
| 531 | 531 | ||
| 532 | /* Stopping infinit transfer */ | 532 | /* Stopping infinite transfer */ |
| 533 | if ((val & COH901318_CX_CTRL_TC_ENABLE) == 0 && | 533 | if ((val & COH901318_CX_CTRL_TC_ENABLE) == 0 && |
| 534 | (val & COH901318_CX_CFG_CH_ENABLE)) | 534 | (val & COH901318_CX_CFG_CH_ENABLE)) |
| 535 | cohc->stopped = 1; | 535 | cohc->stopped = 1; |