diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-06-21 17:52:58 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-06-21 17:52:58 +0200 |
commit | 0a1801e26c5237c259e863b4071c6a61d33ec666 (patch) | |
tree | d6400940c42cd04742398c85cf18e532dc2e56b7 /sound/soc/tegra/Makefile | |
parent | 0af49ffe3c04ed5a9095ea1349d3e26a1e8b311a (diff) | |
parent | 84bbc4aa2de97143db0f6ef0c3fa0bd84f73b207 (diff) | |
download | linux-0a1801e26c5237c259e863b4071c6a61d33ec666.tar.bz2 |
Merge tag 'asoc-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.11
Not a big release subsystem wise, the main changes have been some nice
improvements on the driver side:
- Lots of cleanups and fixes for Blackfin, SGTL5000 and UX500.
- Generalisation of the Bluetooth and HDMI stub drivers.
- New CODEC drivers for SSM2518 and RT5640.
- New machine driver for Tegra CPUs with RT5640.
Diffstat (limited to 'sound/soc/tegra/Makefile')
-rw-r--r-- | sound/soc/tegra/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/tegra/Makefile b/sound/soc/tegra/Makefile index 416a14bde41b..21d2550a08a4 100644 --- a/sound/soc/tegra/Makefile +++ b/sound/soc/tegra/Makefile @@ -18,12 +18,14 @@ obj-$(CONFIG_SND_SOC_TEGRA30_AHUB) += snd-soc-tegra30-ahub.o obj-$(CONFIG_SND_SOC_TEGRA30_I2S) += snd-soc-tegra30-i2s.o # Tegra machine Support +snd-soc-tegra-rt5640-objs := tegra_rt5640.o snd-soc-tegra-wm8753-objs := tegra_wm8753.o snd-soc-tegra-wm8903-objs := tegra_wm8903.o snd-soc-tegra-wm9712-objs := tegra_wm9712.o snd-soc-tegra-trimslice-objs := trimslice.o snd-soc-tegra-alc5632-objs := tegra_alc5632.o +obj-$(CONFIG_SND_SOC_TEGRA_RT5640) += snd-soc-tegra-rt5640.o obj-$(CONFIG_SND_SOC_TEGRA_WM8753) += snd-soc-tegra-wm8753.o obj-$(CONFIG_SND_SOC_TEGRA_WM8903) += snd-soc-tegra-wm8903.o obj-$(CONFIG_SND_SOC_TEGRA_WM9712) += snd-soc-tegra-wm9712.o |