diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-21 12:00:27 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-21 12:00:27 +0100 |
| commit | a9e3de6f9f4f3c9deb409d06fa4f4cfbe9878843 (patch) | |
| tree | 41dd8005dbeb839c9c92c1ab310e160f405c47df /sound/soc/tegra | |
| parent | 97945c46a23de5f9dfedf1b4a33e51d074df9a9c (diff) | |
| parent | 47912a657ec2aa52c7af5f5e2ecc4efe41094d44 (diff) | |
| download | op-kernel-dev-a9e3de6f9f4f3c9deb409d06fa4f4cfbe9878843.zip op-kernel-dev-a9e3de6f9f4f3c9deb409d06fa4f4cfbe9878843.tar.gz | |
Merge branch 'tegra' into for-2.6.40
Fix up merge with Harmony driver rename.
Conflicts:
sound/soc/tegra/Kconfig
Diffstat (limited to 'sound/soc/tegra')
| -rw-r--r-- | sound/soc/tegra/Kconfig | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig index 14f7119..a759fbe 100644 --- 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 |
