aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/Makefile
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2019-09-09 14:55:20 +0100
committerMark Brown <broonie@kernel.org>2019-09-09 14:55:20 +0100
commitbb831786117519fc16dfd3eaa7b84e4f6bbb8d99 (patch)
tree18f8333bbaf6918a0246113eeb0f056011e436f2 /sound/soc/Makefile
parentMerge branch 'asoc-5.3' into asoc-linus (diff)
parentASoC: hdmi-codec: Add an op to set callback function for plug event (diff)
downloadlinux-dev-bb831786117519fc16dfd3eaa7b84e4f6bbb8d99.tar.xz
linux-dev-bb831786117519fc16dfd3eaa7b84e4f6bbb8d99.zip
Merge branch 'asoc-5.4' into asoc-next
Diffstat (limited to 'sound/soc/Makefile')
-rw-r--r--sound/soc/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index d90ce8a32887..861a21b79484 100644
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0
-snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-utils.o
+snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-utils.o soc-dai.o soc-component.o
snd-soc-core-objs += soc-pcm.o soc-io.o soc-devres.o soc-ops.o
snd-soc-core-$(CONFIG_SND_SOC_COMPRESS) += soc-compress.o
@@ -39,7 +39,6 @@ obj-$(CONFIG_SND_SOC) += intel/
obj-$(CONFIG_SND_SOC) += mediatek/
obj-$(CONFIG_SND_SOC) += meson/
obj-$(CONFIG_SND_SOC) += mxs/
-obj-$(CONFIG_SND_SOC) += nuc900/
obj-$(CONFIG_SND_SOC) += kirkwood/
obj-$(CONFIG_SND_SOC) += pxa/
obj-$(CONFIG_SND_SOC) += qcom/