diff options
author | Mark Brown <broonie@linaro.org> | 2013-12-02 06:47:11 -0500 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-12-02 06:47:11 -0500 |
commit | c0d38da61d28b9fad226218acc5716c333dab3e4 (patch) | |
tree | b92634dee66664336a731d12935c0d8a255a5573 /include/sound/dmaengine_pcm.h | |
parent | c6aeb7de226dd08ad9b343fc6cbaf2ff36f69c84 (diff) | |
parent | a22f33b00346f26d29483cdacdbf26df7947ef23 (diff) |
Merge remote-tracking branch 'asoc/topic/dma' into asoc-bcm2835
Diffstat (limited to 'include/sound/dmaengine_pcm.h')
-rw-r--r-- | include/sound/dmaengine_pcm.h | 4 |
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, | |||
140 | unsigned int flags); | 140 | unsigned int flags); |
141 | void snd_dmaengine_pcm_unregister(struct device *dev); | 141 | void snd_dmaengine_pcm_unregister(struct device *dev); |
142 | 142 | ||
143 | int devm_snd_dmaengine_pcm_register(struct device *dev, | ||
144 | const struct snd_dmaengine_pcm_config *config, | ||
145 | unsigned int flags); | ||
146 | |||
143 | int snd_dmaengine_pcm_prepare_slave_config(struct snd_pcm_substream *substream, | 147 | int snd_dmaengine_pcm_prepare_slave_config(struct snd_pcm_substream *substream, |
144 | struct snd_pcm_hw_params *params, | 148 | struct snd_pcm_hw_params *params, |
145 | struct dma_slave_config *slave_config); | 149 | struct dma_slave_config *slave_config); |