diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/arm/mach-bcmring/include/mach/dma.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/arm/mach-bcmring/include/mach/dma.h')
| -rw-r--r-- | arch/arm/mach-bcmring/include/mach/dma.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-bcmring/include/mach/dma.h b/arch/arm/mach-bcmring/include/mach/dma.h index 847980c85c88..1f2c5319c056 100644 --- a/arch/arm/mach-bcmring/include/mach/dma.h +++ b/arch/arm/mach-bcmring/include/mach/dma.h | |||
| @@ -651,7 +651,7 @@ int dma_map_add_region(DMA_MemMap_t *memMap, /* Stores state information about t | |||
| 651 | /** | 651 | /** |
| 652 | * Creates a descriptor ring from a memory mapping. | 652 | * Creates a descriptor ring from a memory mapping. |
| 653 | * | 653 | * |
| 654 | * @return 0 on sucess, error code otherwise. | 654 | * @return 0 on success, error code otherwise. |
| 655 | */ | 655 | */ |
| 656 | /****************************************************************************/ | 656 | /****************************************************************************/ |
| 657 | 657 | ||