From b0ee5fbab742d234f87c0186a5cae2aba85ba7a7 Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Thu, 13 Jan 2011 15:21:53 -0700 Subject: [PATCH] ASoC: tegra: Remove TEGRA_I2S_AUDIO from Kconfig That config variable doesn't exist in the mainline kernel, and hence the dependency shouldn't either. In linux-tegra-2.6.36, the dependency did exist to avoid a conflict with the old non-ALSA Tegra I2S driver. However, this isn't and won't be upstreamed. Signed-off-by: Stephen Warren Acked-by: Liam Girdwood Signed-off-by: Mark Brown --- sound/soc/tegra/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig index 5514f1c7ca25..66b504f06c23 100644 --- a/sound/soc/tegra/Kconfig +++ b/sound/soc/tegra/Kconfig @@ -8,7 +8,6 @@ config SND_TEGRA_SOC config SND_TEGRA_SOC_I2S tristate depends on SND_TEGRA_SOC - depends on !TEGRA_I2S_AUDIO default m help Say Y or M if you want to add support for codecs attached to the -- 2.34.1