]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
ASoC: fsl: Do not force codecs selection by SND_SOC_FSL_ASOC_CARD
authorFabio Estevam <fabio.estevam@freescale.com>
Tue, 30 Sep 2014 19:52:15 +0000 (16:52 -0300)
committerMark Brown <broonie@kernel.org>
Wed, 1 Oct 2014 16:07:05 +0000 (17:07 +0100)
The wm8962 driver uses the input subsystem, but it is selected by
SND_SOC_FSL_ASOC_CARD, which can be built with CONFIG_INPUT disabled,
resulting in this link error:

ERROR: "input_event" [sound/soc/codecs/snd-soc-wm8962.ko] undefined!
ERROR: "input_register_device" [sound/soc/codecs/snd-soc-wm8962.ko] undefined!
ERROR: "devm_input_allocate_device" [sound/soc/codecs/snd-soc-wm8962.ko] undefined!

Do not force the selection of the codecs by SND_SOC_FSL_ASOC_CARD to avoid
such problem.

Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/fsl/Kconfig

index 7c1da8ede9750fe360fb5025b2587c75b62d35da..0f23d1ae5be72ff0cf5829aa222e932218dc578c 100644 (file)
@@ -289,9 +289,6 @@ config SND_SOC_FSL_ASOC_CARD
        select SND_SOC_FSL_ESAI
        select SND_SOC_FSL_SAI
        select SND_SOC_FSL_SSI
-       select SND_SOC_CS42XX8_I2C
-       select SND_SOC_SGTL5000
-       select SND_SOC_WM8962
        help
         ALSA SoC Audio support with ASRC feature for Freescale SoCs that have
         ESAI/SAI/SSI and connect with external CODECs such as WM8962, CS42888