ASoC: fix broken pxa SoC support
authorRobert Jarzmik <robert.jarzmik@free.fr>
Tue, 15 Sep 2015 18:51:31 +0000 (20:51 +0200)
committerMark Brown <broonie@kernel.org>
Wed, 16 Sep 2015 19:58:27 +0000 (20:58 +0100)
commit3c8f7710c1c44fb650bc29b6ef78ed8b60cfaa28
treeb45472979d9cf260a3ee44686eed7e0f582a32d2
parent6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f
ASoC: fix broken pxa SoC support

The previous fix of pxa library support, which was introduced to fix the
library dependency, broke the previous SoC behavior, where a machine
code binding pxa2xx-ac97 with a coded relied on :
 - sound/soc/pxa/pxa2xx-ac97.c
 - sound/soc/codecs/XXX.c

For example, the mioa701_wm9713.c machine code is currently broken. The
"select ARM" statement wrongly selects the soc/arm/pxa2xx-ac97 for
compilation, as per an unfortunate fate SND_PXA2XX_AC97 is both declared
in sound/arm/Kconfig and sound/soc/pxa/Kconfig.

Fix this by ensuring that SND_PXA2XX_SOC correctly triggers the correct
pxa2xx-ac97 compilation.

Fixes: 846172dfe33c ("ASoC: fix SND_PXA2XX_LIB Kconfig warning")
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/arm/Kconfig
sound/soc/pxa/Kconfig