ASoC: Merge AT91 and AVR32 support into a single atmel architecture

[linux-2.6-omap-h63xx.git] / sound / soc / Kconfig

diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
index 18f28ac4bfe82997733df97c1c1eaaf05dc41adb..615ebf0b76e754c96cde95d2a22acdaf63b44676 100644 (file)
--- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@ -2,16 +2,10 @@
 # SoC audio configuration
 #
 
-menu "System on Chip audio support"
-       depends on SND!=n
-
-config SND_SOC_AC97_BUS
-       bool
-
-config SND_SOC
+menuconfig SND_SOC
        tristate "ALSA for SoC audio support"
-       depends on SND
        select SND_PCM
+       select AC97_BUS if SND_SOC_AC97_BUS
        ---help---
 
          If you want ASoC support, you should say Y here and also to the
@@ -23,16 +17,24 @@ config SND_SOC
          This ASoC audio support can also be built as a module.  If so, the module
          will be called snd-soc-core.
 
+if SND_SOC
+
+config SND_SOC_AC97_BUS
+       bool
+
 # All the supported Soc's
-source "sound/soc/at91/Kconfig"
+source "sound/soc/atmel/Kconfig"
+source "sound/soc/au1x/Kconfig"
 source "sound/soc/pxa/Kconfig"
 source "sound/soc/s3c24xx/Kconfig"
 source "sound/soc/sh/Kconfig"
 source "sound/soc/fsl/Kconfig"
 source "sound/soc/davinci/Kconfig"
 source "sound/soc/omap/Kconfig"
+source "sound/soc/blackfin/Kconfig"
 
 # Supported codecs
 source "sound/soc/codecs/Kconfig"
 
-endmenu
+endif  # SND_SOC
+