diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-06 22:09:21 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-06 22:09:21 +0200 |
| commit | 8e31cbc66b4c92fd1b70cbacc4917df322345f42 (patch) | |
| tree | 52507fb16023061032deba8158c485dade952446 /sound | |
| parent | 0508c8e7d47bb64a13cb5d080c4520fe90880b18 (diff) | |
| parent | 702b0e4f2f2782962aab7d9a0a40ad68770bb1f6 (diff) | |
Merge branch 'for-3.6/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup
From Stephen Warren <swarren@wwwdotorg.org>:
This branch contains various minor cleanups, such as binding and .dts
renames, DT content cleanup, SDHCI support-8bit property usage cleanup, and
removal of some unnecessary sleep code.
* 'for-3.6/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
ARM: dt: tegra: rename board files to match SoC
ASoC: tegra: simplify Kconfig dependencies
ARM: dt: tegra: remove legacy support-8bit property
mmc: tegra: use bus-width property instead of support-8bit
ARM: tegra: Remove flow controller programming
dt: name all Tegra binding docs consistently
ARM: tegra20: Rename "emc" to "memory-controller"
ARM: dt: tegra20: Rename "emc" to "memory-controller"
ARM: tegra{20,30}: Rename "mc" to "memory-controller"
ARM: dt: tegra{20,30}.dtsi: Rename "mc" to "memory-controller"
amba: tegra-ahb: Remove empty *_remove()
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/tegra/Kconfig | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig index c1c8e955f4d..76dc230f2bb 100644 --- a/sound/soc/tegra/Kconfig +++ b/sound/soc/tegra/Kconfig @@ -58,17 +58,9 @@ config SND_SOC_TEGRA_WM8753 Say Y or M here if you want to add support for SoC audio on Tegra boards using the WM8753 codec, such as Whistler. -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_HAS_SND_SOC_TEGRA_WM8903 select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC select SND_SOC_WM8903 @@ -79,7 +71,7 @@ config SND_SOC_TEGRA_WM8903 config SND_SOC_TEGRA_TRIMSLICE tristate "SoC Audio support for TrimSlice board" - depends on SND_SOC_TEGRA && MACH_TRIMSLICE && I2C + depends on SND_SOC_TEGRA && I2C select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC select SND_SOC_TLV320AIC23 help |