diff options
author | Axel Lin <axel.lin@gmail.com> | 2012-01-10 01:19:12 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-01-10 17:52:20 -0500 |
commit | e4e9e05409280b50003280afffe27ade21480dd7 (patch) | |
tree | 227bf78e86e37ffcf575f791564b80d647fca47d /sound/soc/atmel/Kconfig | |
parent | 3befc925cb658227fb207f20e6719987f7ee3190 (diff) |
ASoC: Fix recursive dependency due to select ATMEL_SSC in SND_ATMEL_SOC_SSC
commit 739be96 "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>
Diffstat (limited to 'sound/soc/atmel/Kconfig')
-rw-r--r-- | sound/soc/atmel/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/atmel/Kconfig b/sound/soc/atmel/Kconfig index a4d6742d61e3..72b09cfd3dc3 100644 --- a/sound/soc/atmel/Kconfig +++ b/sound/soc/atmel/Kconfig | |||
@@ -9,7 +9,6 @@ config SND_ATMEL_SOC | |||
9 | config SND_ATMEL_SOC_SSC | 9 | config SND_ATMEL_SOC_SSC |
10 | tristate | 10 | tristate |
11 | depends on SND_ATMEL_SOC | 11 | depends on SND_ATMEL_SOC |
12 | select ATMEL_SSC | ||
13 | help | 12 | help |
14 | Say Y or M if you want to add support for codecs the | 13 | Say Y or M if you want to add support for codecs the |
15 | ATMEL SSC interface. You will also needs to select the individual | 14 | ATMEL SSC interface. You will also needs to select the individual |
@@ -27,7 +26,7 @@ config SND_AT91_SOC_SAM9G20_WM8731 | |||
27 | 26 | ||
28 | config SND_AT91_SOC_AFEB9260 | 27 | config SND_AT91_SOC_AFEB9260 |
29 | tristate "SoC Audio support for AFEB9260 board" | 28 | tristate "SoC Audio support for AFEB9260 board" |
30 | depends on ARCH_AT91 && MACH_AFEB9260 && SND_ATMEL_SOC | 29 | depends on ATMEL_SSC && ARCH_AT91 && MACH_AFEB9260 && SND_ATMEL_SOC |
31 | select SND_ATMEL_SOC_SSC | 30 | select SND_ATMEL_SOC_SSC |
32 | select SND_SOC_TLV320AIC23 | 31 | select SND_SOC_TLV320AIC23 |
33 | help | 32 | help |