[PATCH] ASoC: tegra: Remove TEGRA_I2S_AUDIO from Kconfig

[PATCH] ASoC: tegra: Remove TEGRA_I2S_AUDIO from Kconfig

[Stephen Warren]

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>
---
 sound/soc/tegra/Kconfig |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

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

Re: [PATCH] ASoC: tegra: Remove TEGRA_I2S_AUDIO from Kconfig

[Liam Girdwood]

On Thu, 2011-01-13 at 15:21 -0700, Stephen Warren wrote:
> 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>
-- 
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk

Re: [PATCH] ASoC: tegra: Remove TEGRA_I2S_AUDIO from Kconfig

[Mark Brown]

On Thu, Jan 13, 2011 at 03:21:53PM -0700, Stephen Warren wrote:
> 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>

Applied, thanks.