From cb53ade274ecc4a00e5b5372f913677c205121df Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Fri, 30 Mar 2012 17:07:22 -0600 Subject: [PATCH] --- yaml --- r: 305574 b: refs/heads/master c: d9bba496d47085555f4b011be6d716308cf4de03 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/tegra/Kconfig | 9 +++++++++ trunk/sound/soc/tegra/Makefile | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 17547c7686a1..242165eff9fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7deb2b450df9975ab05deb885e386d59a16213a9 +refs/heads/master: d9bba496d47085555f4b011be6d716308cf4de03 diff --git a/trunk/sound/soc/tegra/Kconfig b/trunk/sound/soc/tegra/Kconfig index f8fcda33208e..23ab00d5b192 100644 --- a/trunk/sound/soc/tegra/Kconfig +++ b/trunk/sound/soc/tegra/Kconfig @@ -4,9 +4,18 @@ config SND_SOC_TEGRA help Say Y or M here if you want support for SoC audio on Tegra. +config SND_SOC_TEGRA_DAS + tristate "Tegra Digital Audio Switch driver" + depends on SND_SOC_TEGRA + help + Say Y or M if you want to add support for the Tegra DAS module. + You will also need to select the individual machine drivers to + support below. + config SND_SOC_TEGRA_I2S tristate depends on SND_SOC_TEGRA + select SND_SOC_TEGRA_DAS help Say Y or M if you want to add support for codecs attached to the Tegra I2S interface. You will also need to select the individual diff --git a/trunk/sound/soc/tegra/Makefile b/trunk/sound/soc/tegra/Makefile index 8e584b8fcfba..6d5d81e188a2 100644 --- a/trunk/sound/soc/tegra/Makefile +++ b/trunk/sound/soc/tegra/Makefile @@ -6,7 +6,7 @@ snd-soc-tegra-spdif-objs := tegra_spdif.o snd-soc-tegra-utils-objs += tegra_asoc_utils.o obj-$(CONFIG_SND_SOC_TEGRA) += snd-soc-tegra-utils.o -obj-$(CONFIG_SND_SOC_TEGRA) += snd-soc-tegra-das.o +obj-$(CONFIG_SND_SOC_TEGRA_DAS) += snd-soc-tegra-das.o obj-$(CONFIG_SND_SOC_TEGRA) += snd-soc-tegra-pcm.o obj-$(CONFIG_SND_SOC_TEGRA_I2S) += snd-soc-tegra-i2s.o obj-$(CONFIG_SND_SOC_TEGRA_SPDIF) += snd-soc-tegra-spdif.o