summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-12-02 11:47:11 +0000
committerMark Brown <broonie@linaro.org>2013-12-02 11:47:11 +0000
commitc0d38da61d28b9fad226218acc5716c333dab3e4 (patch)
treeb92634dee66664336a731d12935c0d8a255a5573 /include
parentc6aeb7de226dd08ad9b343fc6cbaf2ff36f69c84 (diff)
parenta22f33b00346f26d29483cdacdbf26df7947ef23 (diff)
Merge remote-tracking branch 'asoc/topic/dma' into asoc-bcm2835
Diffstat (limited to 'include')
-rw-r--r--include/sound/dmaengine_pcm.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/sound/dmaengine_pcm.h b/include/sound/dmaengine_pcm.h
index 15017311f2e9..4ef986cab182 100644
--- a/include/sound/dmaengine_pcm.h
+++ b/include/sound/dmaengine_pcm.h
@@ -140,6 +140,10 @@ int snd_dmaengine_pcm_register(struct device *dev,
unsigned int flags);
void snd_dmaengine_pcm_unregister(struct device *dev);
+int devm_snd_dmaengine_pcm_register(struct device *dev,
+ const struct snd_dmaengine_pcm_config *config,
+ unsigned int flags);
+
int snd_dmaengine_pcm_prepare_slave_config(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params,
struct dma_slave_config *slave_config);