ASoC: tegra: Remove TEGRA_I2S_AUDIO from Kconfig
authorStephen Warren <swarren@nvidia.com>
Thu, 13 Jan 2011 22:21:53 +0000 (15:21 -0700)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 14 Jan 2011 12:30:29 +0000 (12:30 +0000)
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>
sound/soc/tegra/Kconfig

index 5514f1c7ca2588f2a87c8af39c02fda6dfdb5423..66b504f06c23ce6178cb236cfeeac5938764727e 100644 (file)
@@ -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