diff --git a/[refs] b/[refs] index 242165eff9fc..6aca6b8a1c16 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9bba496d47085555f4b011be6d716308cf4de03 +refs/heads/master: c0d5a47ca86047aca1616b744ab3ef31b3448994 diff --git a/trunk/sound/soc/tegra/Makefile b/trunk/sound/soc/tegra/Makefile index 6d5d81e188a2..714d36070b86 100644 --- a/trunk/sound/soc/tegra/Makefile +++ b/trunk/sound/soc/tegra/Makefile @@ -1,13 +1,13 @@ # Tegra platform Support -snd-soc-tegra-das-objs := tegra_das.o snd-soc-tegra-pcm-objs := tegra_pcm.o +snd-soc-tegra-utils-objs += tegra_asoc_utils.o +snd-soc-tegra-das-objs := tegra_das.o snd-soc-tegra-i2s-objs := tegra_i2s.o snd-soc-tegra-spdif-objs := tegra_spdif.o -snd-soc-tegra-utils-objs += tegra_asoc_utils.o +obj-$(CONFIG_SND_SOC_TEGRA) += snd-soc-tegra-pcm.o obj-$(CONFIG_SND_SOC_TEGRA) += snd-soc-tegra-utils.o obj-$(CONFIG_SND_SOC_TEGRA_DAS) += snd-soc-tegra-das.o -obj-$(CONFIG_SND_SOC_TEGRA) += snd-soc-tegra-pcm.o obj-$(CONFIG_SND_SOC_TEGRA_I2S) += snd-soc-tegra-i2s.o obj-$(CONFIG_SND_SOC_TEGRA_SPDIF) += snd-soc-tegra-spdif.o