Merge branch 'tegra' into for-2.6.40

Fix up merge with Harmony driver rename.

Conflicts:
	sound/soc/tegra/Kconfig

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 3cdeffc97b4452f7e1abb34c34b02f40f25cbadf..5ec1846aa1d0d13c17b143cd72235919b8bc5f26 100644 (file)
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -27,12 +27,14 @@ comment "Tegra board type"
 
 config MACH_HARMONY
        bool "Harmony board"
+       select MACH_HAS_SND_SOC_TEGRA_WM8903
        help
          Support for nVidia Harmony development platform
 
 config MACH_KAEN
        bool "Kaen board"
        select MACH_SEABOARD
+       select MACH_HAS_SND_SOC_TEGRA_WM8903
        help
          Support for the Kaen version of Seaboard
 
@@ -43,6 +45,7 @@ config MACH_PAZ00
 
 config MACH_SEABOARD
        bool "Seaboard board"
+       select MACH_HAS_SND_SOC_TEGRA_WM8903
        help
          Support for nVidia Seaboard development platform. It will
         also be included for some of the derivative boards that

diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig
index 14f711977ae319cb3a84ab821b5488645f88cc25..a759fbe1263f35f61169f13ee5d83b2c9daf8ba3 100644 (file)
--- a/sound/soc/tegra/Kconfig
+++ b/sound/soc/tegra/Kconfig
@@ -14,10 +14,17 @@ config SND_SOC_TEGRA_I2S
          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_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_SOC_TEGRA_I2S
        select SND_SOC_WM8903