Merge branch 'for-linville' of git://github.com/kvalo/ath6kl

[~andy/linux] / sound / soc / atmel / Kconfig

diff --git a/sound/soc/atmel/Kconfig b/sound/soc/atmel/Kconfig
index a4d6742d61e3519060f11d3dc7f4717a664f1dd3..72b09cfd3dc367d4aa28826e750e27aa2ffb1885 100644 (file)
--- a/sound/soc/atmel/Kconfig
+++ b/sound/soc/atmel/Kconfig
@@ -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