diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 18:32:13 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 18:32:13 -0400 |
| commit | a84bd2ee81ea1bdbd238cd1c380ec25f50a876c5 (patch) | |
| tree | ba054d4b1a20dadec088fd4d8983fb5939227e46 /arch/arm/mach-bcmring/dma.c | |
| parent | aec995900fbc8cffa9f0f9e797ef07a0beb2b079 (diff) | |
| parent | 7db6a7fa09884b34d2a5d4e6e4ed58664a5f0cf8 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes
Diffstat (limited to 'arch/arm/mach-bcmring/dma.c')
| -rw-r--r-- | arch/arm/mach-bcmring/dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-bcmring/dma.c b/arch/arm/mach-bcmring/dma.c index 8d1baf3f4683..d87ad30dda35 100644 --- a/arch/arm/mach-bcmring/dma.c +++ b/arch/arm/mach-bcmring/dma.c | |||
| @@ -629,7 +629,7 @@ EXPORT_SYMBOL(dma_get_device_descriptor_ring); | |||
| 629 | * Configures a DMA channel. | 629 | * Configures a DMA channel. |
| 630 | * | 630 | * |
| 631 | * @return | 631 | * @return |
| 632 | * >= 0 - Initialization was successfull. | 632 | * >= 0 - Initialization was successful. |
| 633 | * | 633 | * |
| 634 | * -EBUSY - Device is currently being used. | 634 | * -EBUSY - Device is currently being used. |
| 635 | * -ENODEV - Device handed in is invalid. | 635 | * -ENODEV - Device handed in is invalid. |
| @@ -673,7 +673,7 @@ static int ConfigChannel(DMA_Handle_t handle) | |||
| 673 | /** | 673 | /** |
| 674 | * Initializes all of the data structures associated with the DMA. | 674 | * Initializes all of the data structures associated with the DMA. |
| 675 | * @return | 675 | * @return |
| 676 | * >= 0 - Initialization was successfull. | 676 | * >= 0 - Initialization was successful. |
| 677 | * | 677 | * |
| 678 | * -EBUSY - Device is currently being used. | 678 | * -EBUSY - Device is currently being used. |
| 679 | * -ENODEV - Device handed in is invalid. | 679 | * -ENODEV - Device handed in is invalid. |