diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:41 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:41 +0000 |
| commit | 2944c2f5d5c88d5893d6a1dad51d0768aed52d00 (patch) | |
| tree | b09658ebfcbb078afe82beb6e462b3edebd03ddd /arch/arm/plat-samsung/include/plat/dma-ops.h | |
| parent | f8843c91c60ed744cc7dd6326e44ddb91250ab35 (diff) | |
| parent | 5b1d3c3472f1941ab1a78575fe9ada718a7c0c25 (diff) | |
| download | blackbird-op-linux-2944c2f5d5c88d5893d6a1dad51d0768aed52d00.tar.gz blackbird-op-linux-2944c2f5d5c88d5893d6a1dad51d0768aed52d00.zip | |
Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next
Diffstat (limited to 'arch/arm/plat-samsung/include/plat/dma-ops.h')
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/dma-ops.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat-samsung/include/plat/dma-ops.h index f5144cdd3001..114178268b75 100644 --- a/arch/arm/plat-samsung/include/plat/dma-ops.h +++ b/arch/arm/plat-samsung/include/plat/dma-ops.h @@ -39,7 +39,8 @@ struct samsung_dma_config { }; struct samsung_dma_ops { - unsigned (*request)(enum dma_ch ch, struct samsung_dma_req *param); + unsigned (*request)(enum dma_ch ch, struct samsung_dma_req *param, + struct device *dev, char *ch_name); int (*release)(unsigned ch, void *param); int (*config)(unsigned ch, struct samsung_dma_config *param); int (*prepare)(unsigned ch, struct samsung_dma_prep *param); |
