Skip to contentSkip to conversation

ASoC: Fix recursive dependency due to select ATMEL_SSC in SND_ATMEL_SOC_SSC

PATCH Applied Axel Lin 2 participants 5 messages Jan 9, 2012 – Jan 10, 2012

Subsystems (4)
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 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 removes 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.

---
 sound/soc/atmel/Kconfig |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
sound/soc/atmel/Kconfig +1 -2
index a4d6742..72b09cf 100644
@@ -9,7 +9,6 @@ config SND_ATMEL_SOC
 config SND_ATMEL_SOC_SSC
 	tristate
 	depends on SND_ATMEL_SOC
-	select ATMEL_SSC
 	help
 	  Say Y or M if you want to add support for codecs the
 	  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
 	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_SOC_TLV320AIC23
 	help
Signature · 1 line
1.7.5.4
Applied
#1 lore raw
Quoted 2 lines · Axel Lin

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

Applied, thanks.

author
#2 lore raw

2012/1/10 Mark Brown <[email protected]>:

Quoted 5 lines · Axel Lin
Quoted 2 lines

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

Applied, thanks.

Hi Mark,
I thought you already applied this one, but you did not. You apply commit 10024e394 (ASoC: Fix build dependency for SND_AT91_SOC_AFEB9260) instead.
Thus you need to apply the patch I sent yesterday ([PATCH] Revert "ASoC: Fix build dependency for SND_ATMEL_SOC_SSC") to fix recursive dependency detected warnings.

Sorry for the mess.

Regards,
Axel

#3 lore raw
Quoted 3 lines · Axel Lin

I thought you already applied this one, but you did not. You apply commit 10024e394 (ASoC: Fix build dependency for SND_AT91_SOC_AFEB9260) instead.

Oh, gah. I've just dropped this patch.

Quoted 3 lines

Thus you need to apply the patch I sent yesterday ([PATCH] Revert "ASoC: Fix build dependency for SND_ATMEL_SOC_SSC") to fix recursive dependency detected warnings.

Please don't just refer to patches on the list unless it's under active discussion or similar, send the patch.

author
#4 lore raw

2012/1/10 Mark Brown <[email protected]>:

Quoted 7 lines · Axel Lin
Quoted 4 lines

I thought you already applied this one, but you did not. You apply commit 10024e394 (ASoC: Fix build dependency for SND_AT91_SOC_AFEB9260) instead.

Oh, gah.  I've just dropped this patch.

Ok.
I found you apply the correct patch now in your for-3.4 branch. But it is strange that the commit 53aa7af780 in your for-3.4 branch is different from the patch I sent.
I'll resent it again now.

Regards,
Axel