From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 21 Apr 2011 11:00:27 +0000 (+0100)
Subject: Merge branch 'tegra' into for-2.6.40
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a9e3de6f9f4f3c9deb409d06fa4f4cfbe9878843;p=linux-beck.git

Merge branch 'tegra' into for-2.6.40

Fix up merge with Harmony driver rename.

Conflicts:
	sound/soc/tegra/Kconfig
---

a9e3de6f9f4f3c9deb409d06fa4f4cfbe9878843
diff --cc sound/soc/tegra/Kconfig
index 14f711977ae3,0f103a101e3c..a759fbe1263f
--- a/sound/soc/tegra/Kconfig
+++ b/sound/soc/tegra/Kconfig
@@@ -14,15 -14,20 +14,22 @@@ config SND_SOC_TEGRA_I2
  	  Tegra I2S interface. You will also need to select the individual
  	  machine drivers to support below.
  
+ config MACH_HAS_SND_SOC_TEGRA_WM8903
+ 	bool
+ 	help
+ 	  Machines that use the SND_SOC_TEGRA_WM8903 driver should select
+ 	  this config option, in order to allow the user to enable
+ 	  SND_SOC_TEGRA_WM8903.
+ 
 -config SND_TEGRA_SOC_HARMONY
 -	tristate "SoC Audio support for Tegra Harmony reference board"
 -	depends on SND_TEGRA_SOC && MACH_HARMONY && I2C
 +config SND_SOC_TEGRA_WM8903
 +	tristate "SoC Audio support for Tegra boards using a WM8903 codec"
 +	depends on SND_SOC_TEGRA && I2C
- 	depends on MACH_HARMONY || MACH_VENTANA || MACH_SEABOARD || MACH_KAEN || MACH_AEBL
++	depends on MACH_HAS_SND_SOC_TEGRA_WM8903
  	default m
 -	select SND_TEGRA_SOC_I2S
 +	select SND_SOC_TEGRA_I2S
  	select SND_SOC_WM8903
  	help
 -	  Say Y or M here if you want to add support for SoC audio on the
 -	  Tegra Harmony reference board.
 +	  Say Y or M here if you want to add support for SoC audio on Tegra
 +	  boards using the WM8093 codec. Currently, the supported boards are
 +	  Harmony, Ventana, Seaboard, Kaen, and Aebl.