diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-05-22 02:58:55 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-05-22 02:58:55 +0200 |
| commit | 85e184e4c3cd3e2285ceab91ff8f0cac094e8a85 (patch) | |
| tree | 1c1cf2d82a62bf0bef4ee390f578dcec35f4b427 /sound/soc/tegra/Makefile | |
| parent | 382e6a859e6622de0aa62c01976ae8ebd90e986d (diff) | |
| parent | 766812e6d5e2e23be1e212cf84902d5e834dd865 (diff) | |
| download | op-kernel-dev-85e184e4c3cd3e2285ceab91ff8f0cac094e8a85.zip op-kernel-dev-85e184e4c3cd3e2285ceab91ff8f0cac094e8a85.tar.gz | |
Merge tag 'asoc-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Last minute updates
These are all new code, they've been in -next already so should be OK
for merge this time round. I'd been planning to send a pull request
today after they'd had a bit of exposure there to make sure breakage
didn't propagate into your tree.
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 98704b4..391e78a 100644 --- a/sound/soc/tegra/Makefile +++ b/sound/soc/tegra/Makefile @@ -16,10 +16,12 @@ 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-wm8753-objs := tegra_wm8753.o snd-soc-tegra-wm8903-objs := tegra_wm8903.o snd-soc-tegra-trimslice-objs := trimslice.o snd-soc-tegra-alc5632-objs := tegra_alc5632.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_TRIMSLICE) += snd-soc-tegra-trimslice.o obj-$(CONFIG_SND_SOC_TEGRA_ALC5632) += snd-soc-tegra-alc5632.o |
