summaryrefslogtreecommitdiff
path: root/sound/oss/os.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-04-29 21:36:22 +0200
committerMark Brown <broonie@linaro.org>2014-05-01 13:47:28 -0700
commit31ee2bfd724ab1fa2fba6472a071bca5e9132139 (patch)
tree025fbc2a7c2b25f51f59522d51904c6776158548 /sound/oss/os.h
parent40e3b934be0e0e04da3b56093958389d5c325c18 (diff)
ASoC: fsl: select SND_SOC_IMX_PCM_DMA where needed
Since commit 204dec93eaa "ASoC: fsl: Allow to select individual common options", it is possible to enable SND_SOC_FSL_SSI and SND_SOC_FSL_SPDIF manually, either as loadable modules or built-in. This unfortunately leads to a link error if one or both of them are built-in, while the imx-pcm-dma framework is a loadable module: sound/built-in.o: In function `fsl_ssi_probe': :(.text+0x51fb8): undefined reference to `imx_pcm_dma_init' sound/built-in.o: In function `fsl_spdif_probe': :(.text+0x52e20): undefined reference to `imx_pcm_dma_init' This changes Kconfig to prevent this case by using 'select' to turn on the imx-pcm-dma code from both drivers. For consistency, we also turn on the imx-pcm-fiq code, which is an alternative to the dma implementation. Note that imx-pcm-fiq is platform dependent, so we must not enable that unless we are building a kernel for i.MX. Note also the "if SND_IMX_SOC != n" syntax as opposed to the normal "if SND_IMX_SOC". This is needed to avoid turning on the options as 'm' if 'SND_IMX_SOC' is a module. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/oss/os.h')
0 files changed, 0 insertions, 0 deletions