Commit e4e9e054 authored Jan 10, 2012 by Axel Lin Committed by Mark Brown Jan 10, 2012

ASoC: Fix recursive dependency due to select ATMEL_SSC in SND_ATMEL_SOC_SSC

commit 739be96a "ASoC: Fix build dependency for SND_ATMEL_SOC_SSC"
introduces below build warnings:

drivers/misc/Kconfig:212:error: recursive dependency detected!
drivers/misc/Kconfig:212: symbol ATMEL_SSC is selected by SND_ATMEL_SOC_SSC
sound/soc/atmel/Kconfig:9: symbol SND_ATMEL_SOC_SSC is selected by SND_AT91_SOC_SAM9G20_WM8731
sound/soc/atmel/Kconfig:18: symbol SND_AT91_SOC_SAM9G20_WM8731 depends on ATMEL_SSC

SND_ATMEL_SOC_SSC needs ATMEL_SSC to pass compilation.
This patch remove the "select ATMEL_SSC" from SND_ATMEL_SOC_SSC to avoid above
warnings. And then ensures all the machine drivers that select SND_ATMEL_SOC_SSC
need to depend on ATMEL_SSC.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

parent 3befc925

sound/soc/atmel/Kconfig

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -9,7 +9,6 @@ config SND_ATMEL_SOC
	config SND_ATMEL_SOC_SSC		config SND_ATMEL_SOC_SSC
	tristate		tristate
	depends on SND_ATMEL_SOC		depends on SND_ATMEL_SOC
	select ATMEL_SSC
	help		help
	Say Y or M if you want to add support for codecs the		Say Y or M if you want to add support for codecs the
	ATMEL SSC interface. You will also needs to select the individual		ATMEL SSC interface. You will also needs to select the individual
	@@ -27,7 +26,7 @@ config SND_AT91_SOC_SAM9G20_WM8731

	config SND_AT91_SOC_AFEB9260		config SND_AT91_SOC_AFEB9260
	tristate "SoC Audio support for AFEB9260 board"		tristate "SoC Audio support for AFEB9260 board"
	depends on ARCH_AT91 && MACH_AFEB9260 && SND_ATMEL_SOC		depends on ATMEL_SSC && ARCH_AT91 && MACH_AFEB9260 && SND_ATMEL_SOC
	select SND_ATMEL_SOC_SSC		select SND_ATMEL_SOC_SSC
	select SND_SOC_TLV320AIC23		select SND_SOC_TLV320AIC23
	help		help