summaryrefslogtreecommitdiffstats
path: root/sound/soc/Kconfig
diff options
context:
space:
mode:
authorSedji Gaouaou <sedji.gaouaou@atmel.com>2008-10-03 16:57:50 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2008-10-31 13:12:26 +0000
commit6c7425095c9ee23d080dba3e27217a254cce4562 (patch)
treec6c27e1c986b2adeda4adbdcad934b816d654b75 /sound/soc/Kconfig
parentdc06102a0c8b5aa0dd7f9a40ce241e793c252a87 (diff)
downloadlinux-6c7425095c9ee23d080dba3e27217a254cce4562.tar.gz
linux-6c7425095c9ee23d080dba3e27217a254cce4562.tar.bz2
linux-6c7425095c9ee23d080dba3e27217a254cce4562.zip
ASoC: Merge AT91 and AVR32 support into a single atmel architecture
The Ateml AT91 and AVR32 SoC share common IP for audio and can share the same driver code using the atmel-ssc API provided for both architectures. Do this, creating a new unified atmel ASoC architecture to replace the previous at32 and at91 ones. [This was contributed as a patch series for reviewability but has been squashed down to a single commit to help preserve both the history and bisectability. A small bugfix from Jukka is included.] Tested-by: Jukka Hynninen <ext-jukka.hynninen@vaisala.com> Signed-off-by: Sedji Gaouaou <sedji.gaouaou@atmel.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/Kconfig')
-rw-r--r--sound/soc/Kconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
index 4dfda6674bec..615ebf0b76e7 100644
--- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@ -23,8 +23,7 @@ config SND_SOC_AC97_BUS
bool
# All the supported Soc's
-source "sound/soc/at32/Kconfig"
-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"