aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/sound/soc/Makefile
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2020-06-04 17:08:03 +0900
committerMark Brown <broonie@kernel.org>2020-06-15 18:21:26 +0100
commit460b42d162e3cf634586999e6a84e74ca52e626d (patch)
tree4d1c5dc40ea4f766425cf0a510bf8e4245b40918 /sound/soc/Makefile
parentASoC: soc-component: add snd_soc_component_init() (diff)
downloadwireguard-linux-460b42d162e3cf634586999e6a84e74ca52e626d.tar.xz
wireguard-linux-460b42d162e3cf634586999e6a84e74ca52e626d.zip
ASoC: soc-component: merge soc-io.c into soc-component.c
soc-io.c has snd_soc_component_xxx() functions for I/O. We have soc-componennt.c for it. Let's merge soc-io.c into soc-component.c By this patch, original soc-io.c functions start to use soc_component_err() when error case. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Link: https://lore.kernel.org/r/87h7vrw8ws.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/Makefile')
-rw-r--r--sound/soc/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index 7f1747518e79..ddbac3a2169f 100644
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
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 soc-link.o soc-card.o
+snd-soc-core-objs += soc-pcm.o soc-devres.o soc-ops.o soc-link.o soc-card.o
snd-soc-core-$(CONFIG_SND_SOC_COMPRESS) += soc-compress.o
ifneq ($(CONFIG_SND_SOC_TOPOLOGY),)