diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-06 16:09:21 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-06 16:09:21 -0400 |
| 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 c1c8e955f4d3..76dc230f2bb0 100644 --- a/sound/soc/tegra/Kconfig +++ b/sound/soc/tegra/Kconfig | |||
| @@ -58,17 +58,9 @@ config SND_SOC_TEGRA_WM8753 | |||
| 58 | Say Y or M here if you want to add support for SoC audio on Tegra | 58 | Say Y or M here if you want to add support for SoC audio on Tegra |
| 59 | boards using the WM8753 codec, such as Whistler. | 59 | boards using the WM8753 codec, such as Whistler. |
| 60 | 60 | ||
| 61 | config MACH_HAS_SND_SOC_TEGRA_WM8903 | ||
| 62 | bool | ||
| 63 | help | ||
| 64 | Machines that use the SND_SOC_TEGRA_WM8903 driver should select | ||
| 65 | this config option, in order to allow the user to enable | ||
| 66 | SND_SOC_TEGRA_WM8903. | ||
| 67 | |||
| 68 | config SND_SOC_TEGRA_WM8903 | 61 | config SND_SOC_TEGRA_WM8903 |
| 69 | tristate "SoC Audio support for Tegra boards using a WM8903 codec" | 62 | tristate "SoC Audio support for Tegra boards using a WM8903 codec" |
| 70 | depends on SND_SOC_TEGRA && I2C | 63 | depends on SND_SOC_TEGRA && I2C |
| 71 | depends on MACH_HAS_SND_SOC_TEGRA_WM8903 | ||
| 72 | select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC | 64 | select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC |
| 73 | select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC | 65 | select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC |
| 74 | select SND_SOC_WM8903 | 66 | select SND_SOC_WM8903 |
| @@ -79,7 +71,7 @@ config SND_SOC_TEGRA_WM8903 | |||
| 79 | 71 | ||
| 80 | config SND_SOC_TEGRA_TRIMSLICE | 72 | config SND_SOC_TEGRA_TRIMSLICE |
| 81 | tristate "SoC Audio support for TrimSlice board" | 73 | tristate "SoC Audio support for TrimSlice board" |
| 82 | depends on SND_SOC_TEGRA && MACH_TRIMSLICE && I2C | 74 | depends on SND_SOC_TEGRA && I2C |
| 83 | select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC | 75 | select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC |
| 84 | select SND_SOC_TLV320AIC23 | 76 | select SND_SOC_TLV320AIC23 |
| 85 | help | 77 | help |