aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShengjiu Wang <shengjiu.wang@freescale.com>2014-08-19 05:36:41 -0400
committerMark Brown <broonie@linaro.org>2014-08-19 12:11:50 -0400
commit38c6e4bb67760db1392b9c5ee0082af07c0db20d (patch)
treeffb8dee8b12e6cd8a0e37a6c3d00a1bc19460e85
parentcdec729765659adafba983d6b6760ad52c71d5d8 (diff)
ASoC: fsl-asoc-card: move 'config SND_SOC_FSL_ASOC_CARD' to 'if SND_IMX_SOC'
Build kernel with SND_SOC_FSL_ASOC_CARD=m && SND_SOC_FSL_{SSI,SAI,ESAI}=y leads the following error: sound/built-in.o: In function `fsl_sai_probe': >> fsl_sai.c:(.text+0x5f662): undefined reference to `imx_pcm_dma_init' sound/built-in.o: In function `fsl_esai_probe': >> fsl_esai.c:(.text+0x6044b): undefined reference to `imx_pcm_dma_init' The config SND_SOC_FSL_ASOC_CARD is for IMX SOC, So move it under condition of 'if SND_IMX_SOC'. Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--sound/soc/fsl/Kconfig34
1 files changed, 17 insertions, 17 deletions
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index 3154f43b11ab..7c1da8ede975 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -59,23 +59,6 @@ config SND_SOC_FSL_ESAI
59config SND_SOC_FSL_UTILS 59config SND_SOC_FSL_UTILS
60 tristate 60 tristate
61 61
62config SND_SOC_FSL_ASOC_CARD
63 tristate "Generic ASoC Sound Card with ASRC support"
64 depends on OF && I2C
65 select SND_SOC_IMX_AUDMUX
66 select SND_SOC_IMX_PCM_DMA
67 select SND_SOC_FSL_ESAI
68 select SND_SOC_FSL_SAI
69 select SND_SOC_FSL_SSI
70 select SND_SOC_CS42XX8_I2C
71 select SND_SOC_SGTL5000
72 select SND_SOC_WM8962
73 help
74 ALSA SoC Audio support with ASRC feature for Freescale SoCs that have
75 ESAI/SAI/SSI and connect with external CODECs such as WM8962, CS42888
76 and SGTL5000.
77 Say Y if you want to add support for Freescale Generic ASoC Sound Card.
78
79config SND_SOC_IMX_PCM_DMA 62config SND_SOC_IMX_PCM_DMA
80 tristate 63 tristate
81 select SND_SOC_GENERIC_DMAENGINE_PCM 64 select SND_SOC_GENERIC_DMAENGINE_PCM
@@ -298,6 +281,23 @@ config SND_SOC_IMX_MC13783
298 select SND_SOC_MC13783 281 select SND_SOC_MC13783
299 select SND_SOC_IMX_PCM_DMA 282 select SND_SOC_IMX_PCM_DMA
300 283
284config SND_SOC_FSL_ASOC_CARD
285 tristate "Generic ASoC Sound Card with ASRC support"
286 depends on OF && I2C
287 select SND_SOC_IMX_AUDMUX
288 select SND_SOC_IMX_PCM_DMA
289 select SND_SOC_FSL_ESAI
290 select SND_SOC_FSL_SAI
291 select SND_SOC_FSL_SSI
292 select SND_SOC_CS42XX8_I2C
293 select SND_SOC_SGTL5000
294 select SND_SOC_WM8962
295 help
296 ALSA SoC Audio support with ASRC feature for Freescale SoCs that have
297 ESAI/SAI/SSI and connect with external CODECs such as WM8962, CS42888
298 and SGTL5000.
299 Say Y if you want to add support for Freescale Generic ASoC Sound Card.
300
301endif # SND_IMX_SOC 301endif # SND_IMX_SOC
302 302
303endmenu 303endmenu