summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2011-01-13 15:21:53 -0700
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-14 12:30:29 +0000
commitb0ee5fbab742d234f87c0186a5cae2aba85ba7a7 (patch)
tree4d0bfcad7cc7607a87a43ce2ae4268c92dc6a5e5 /sound
parent4e10bda05d6c7d4aba509bbbab5ba748d54c702f (diff)
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>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/tegra/Kconfig1
1 files changed, 0 insertions, 1 deletions
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