diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /arch/arm/plat-omap/dma.c | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'arch/arm/plat-omap/dma.c')
| -rw-r--r-- | arch/arm/plat-omap/dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index 68eaae324b6a..b5d786d4573b 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c | |||
| @@ -1246,7 +1246,7 @@ static void create_dma_lch_chain(int lch_head, int lch_queue) | |||
| 1246 | * OMAP_DMA_DYNAMIC_CHAIN | 1246 | * OMAP_DMA_DYNAMIC_CHAIN |
| 1247 | * @params - Channel parameters | 1247 | * @params - Channel parameters |
| 1248 | * | 1248 | * |
| 1249 | * @return - Succes : 0 | 1249 | * @return - Success : 0 |
| 1250 | * Failure: -EINVAL/-ENOMEM | 1250 | * Failure: -EINVAL/-ENOMEM |
| 1251 | */ | 1251 | */ |
| 1252 | int omap_request_dma_chain(int dev_id, const char *dev_name, | 1252 | int omap_request_dma_chain(int dev_id, const char *dev_name, |