summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2012-07-18 13:20:42 +0200
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2012-07-18 13:20:42 +0200
commitb54668629ce607a9643f1a354fc2622a37a48b43 (patch)
tree6aa0f713854a15bfa78840278ddb93a845553599 /sound/soc
parent328d61af72a8f59f5dc53db8cddf8c8e572ad958 (diff)
asoc: tegra2: fix ac97 das build dependency
Building an ac97 only configuration failed due to missing SND_SOC_TEGRA20_DAS. While at it fix build time warning caused by two unused local variables.
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/tegra/Kconfig1
-rw-r--r--sound/soc/tegra/colibri_t20.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig
index 40717a6f2ee3..caecd66c199c 100644
--- a/sound/soc/tegra/Kconfig
+++ b/sound/soc/tegra/Kconfig
@@ -9,6 +9,7 @@ config SND_SOC_TEGRA20_AC97
select AC97_BUS
select SND_AC97_CODEC
select SND_SOC_AC97_BUS
+ select SND_SOC_TEGRA20_DAS
help
Say Y or M if you want to add support for codecs attached to the
Tegra AC97 interface. You will also need to select the individual
diff --git a/sound/soc/tegra/colibri_t20.c b/sound/soc/tegra/colibri_t20.c
index b07f814e4731..3b5e1586ede0 100644
--- a/sound/soc/tegra/colibri_t20.c
+++ b/sound/soc/tegra/colibri_t20.c
@@ -51,8 +51,6 @@ static int colibri_t20_wm9715l_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params)
{
struct snd_soc_pcm_runtime *rtd = substream->private_data;
- struct snd_soc_dai *codec_dai = rtd->codec_dai;
- struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
struct snd_soc_codec *codec = rtd->codec;
struct snd_soc_card *card = codec->card;
struct colibri_t20_wm9715l *machine = snd_soc_card_get_drvdata(card);