diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-04 21:30:01 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-04 21:30:01 +0400 |
| commit | 986a622df307644af14618bee54c901aa74816da (patch) | |
| tree | 6da87812b9120634381e3e3987e115f90bd562e0 /sound/soc/fsl/imx-pcm.h | |
| parent | 8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 (diff) | |
| parent | 28e5ca73ef9072ed58dbb81cfff6f908be8e3cd4 (diff) | |
| download | linux-986a622df307644af14618bee54c901aa74816da.tar.xz | |
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
Diffstat (limited to 'sound/soc/fsl/imx-pcm.h')
| -rw-r--r-- | sound/soc/fsl/imx-pcm.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/fsl/imx-pcm.h b/sound/soc/fsl/imx-pcm.h index b7fa0d75c687..67f656c7c320 100644 --- a/sound/soc/fsl/imx-pcm.h +++ b/sound/soc/fsl/imx-pcm.h @@ -32,11 +32,6 @@ imx_pcm_dma_params_init_data(struct imx_dma_data *dma_data, dma_data->peripheral_type = IMX_DMATYPE_SSI; } -int snd_imx_pcm_mmap(struct snd_pcm_substream *substream, - struct vm_area_struct *vma); -int imx_pcm_new(struct snd_soc_pcm_runtime *rtd); -void imx_pcm_free(struct snd_pcm *pcm); - #ifdef CONFIG_SND_SOC_IMX_PCM_DMA int imx_pcm_dma_init(struct platform_device *pdev); void imx_pcm_dma_exit(struct platform_device *pdev); @@ -53,11 +48,16 @@ static inline void imx_pcm_dma_exit(struct platform_device *pdev) #ifdef CONFIG_SND_SOC_IMX_PCM_FIQ int imx_pcm_fiq_init(struct platform_device *pdev); +void imx_pcm_fiq_exit(struct platform_device *pdev); #else static inline int imx_pcm_fiq_init(struct platform_device *pdev) { return -ENODEV; } + +static inline void imx_pcm_fiq_exit(struct platform_device *pdev) +{ +} #endif #endif /* _IMX_PCM_H */ |