From: Stephen Warren <swarren@nvidia.com>
Date: Thu, 13 Jan 2011 22:21:53 +0000 (-0700)
Subject: ASoC: tegra: Remove TEGRA_I2S_AUDIO from Kconfig
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b0ee5fbab742d234f87c0186a5cae2aba85ba7a7;p=mv-sheeva.git

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 <swarren@nvidia.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---

diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig
index 5514f1c7ca2..66b504f06c2 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