diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2013-07-29 17:37:32 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-07-31 09:59:11 -0400 |
commit | 3f1a91aa25579ba5e7268a47a73d2a83e4802c62 (patch) | |
tree | 8e3b888ba22c1874135cf176e8882af499d39ed6 | |
parent | 32bd8cd25759411d3e11351db59be05446092f80 (diff) |
ASoC: fsl: Fix module build
Building imx_v6_v7_defconfig with all audio drivers as modules results in
the folowing build error:
ERROR: "imx_pcm_fiq_init" [sound/soc/fsl/snd-soc-imx-ssi.ko] undefined!
ERROR: "imx_pcm_dma_init" [sound/soc/fsl/snd-soc-imx-ssi.ko] undefined!
ERROR: "imx_pcm_fiq_exit" [sound/soc/fsl/snd-soc-imx-ssi.ko] undefined!
ERROR: "imx_pcm_dma_exit" [sound/soc/fsl/snd-soc-imx-ssi.ko] undefined!
ERROR: "imx_pcm_dma_init" [sound/soc/fsl/snd-soc-fsl-ssi.ko] undefined!
ERROR: "imx_pcm_dma_exit" [sound/soc/fsl/snd-soc-fsl-ssi.ko] undefined!
Fix this by allowing SND_SOC_IMX_PCM_FIQ and SND_SOC_IMX_PCM_DMA to be also
built as modules and by using 'IS_ENABLED' to cover the module case.
Reported-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r-- | sound/soc/fsl/Kconfig | 4 | ||||
-rw-r--r-- | sound/soc/fsl/imx-pcm.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 3a79d01e8d03..c26449b54270 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig | |||
@@ -109,11 +109,11 @@ config SND_SOC_IMX_SSI | |||
109 | tristate | 109 | tristate |
110 | 110 | ||
111 | config SND_SOC_IMX_PCM_FIQ | 111 | config SND_SOC_IMX_PCM_FIQ |
112 | bool | 112 | tristate |
113 | select FIQ | 113 | select FIQ |
114 | 114 | ||
115 | config SND_SOC_IMX_PCM_DMA | 115 | config SND_SOC_IMX_PCM_DMA |
116 | bool | 116 | tristate |
117 | select SND_SOC_GENERIC_DMAENGINE_PCM | 117 | select SND_SOC_GENERIC_DMAENGINE_PCM |
118 | 118 | ||
119 | config SND_SOC_IMX_AUDMUX | 119 | config SND_SOC_IMX_AUDMUX |
diff --git a/sound/soc/fsl/imx-pcm.h b/sound/soc/fsl/imx-pcm.h index 9136625a3460..5d5b73303e11 100644 --- a/sound/soc/fsl/imx-pcm.h +++ b/sound/soc/fsl/imx-pcm.h | |||
@@ -38,7 +38,7 @@ struct imx_pcm_fiq_params { | |||
38 | struct snd_dmaengine_dai_dma_data *dma_params_tx; | 38 | struct snd_dmaengine_dai_dma_data *dma_params_tx; |
39 | }; | 39 | }; |
40 | 40 | ||
41 | #ifdef CONFIG_SND_SOC_IMX_PCM_DMA | 41 | #if IS_ENABLED(CONFIG_SND_SOC_IMX_PCM_DMA) |
42 | int imx_pcm_dma_init(struct platform_device *pdev); | 42 | int imx_pcm_dma_init(struct platform_device *pdev); |
43 | void imx_pcm_dma_exit(struct platform_device *pdev); | 43 | void imx_pcm_dma_exit(struct platform_device *pdev); |
44 | #else | 44 | #else |
@@ -52,7 +52,7 @@ static inline void imx_pcm_dma_exit(struct platform_device *pdev) | |||
52 | } | 52 | } |
53 | #endif | 53 | #endif |
54 | 54 | ||
55 | #ifdef CONFIG_SND_SOC_IMX_PCM_FIQ | 55 | #if IS_ENABLED(CONFIG_SND_SOC_IMX_PCM_FIQ) |
56 | int imx_pcm_fiq_init(struct platform_device *pdev, | 56 | int imx_pcm_fiq_init(struct platform_device *pdev, |
57 | struct imx_pcm_fiq_params *params); | 57 | struct imx_pcm_fiq_params *params); |
58 | void imx_pcm_fiq_exit(struct platform_device *pdev); | 58 | void imx_pcm_fiq_exit(struct platform_device *pdev); |