summaryrefslogtreecommitdiff
path: root/rr-cache/5be910894ae8db7b83cdac81cc58dc83c4671161/thisimage
diff options
context:
space:
mode:
Diffstat (limited to 'rr-cache/5be910894ae8db7b83cdac81cc58dc83c4671161/thisimage')
-rw-r--r--rr-cache/5be910894ae8db7b83cdac81cc58dc83c4671161/thisimage15
1 files changed, 15 insertions, 0 deletions
diff --git a/rr-cache/5be910894ae8db7b83cdac81cc58dc83c4671161/thisimage b/rr-cache/5be910894ae8db7b83cdac81cc58dc83c4671161/thisimage
new file mode 100644
index 0000000..117cffc
--- /dev/null
+++ b/rr-cache/5be910894ae8db7b83cdac81cc58dc83c4671161/thisimage
@@ -0,0 +1,15 @@
+obj-$(CONFIG_SND_SOC_QDSP6_COMMON) += q6dsp-common.o
+<<<<<<<
+obj-$(CONFIG_SND_SOC_QDSP6_AFE) += q6afe.o q6afe-dai.o
+obj-$(CONFIG_SND_SOC_QDSP6_ADM) += q6adm.o q6routing.o
+obj-$(CONFIG_SND_SOC_QDSP6_ASM) += q6asm.o q6asm-dai.o
+obj-$(CONFIG_SND_SOC_QDSP6_CORE) += q6core.o
+=======
+obj-$(CONFIG_SND_SOC_QDSP6_CORE) += q6core.o
+obj-$(CONFIG_SND_SOC_QDSP6_AFE) += q6afe.o
+obj-$(CONFIG_SND_SOC_QDSP6_AFE_DAI) += q6afe-dai.o
+obj-$(CONFIG_SND_SOC_QDSP6_ADM) += q6adm.o
+obj-$(CONFIG_SND_SOC_QDSP6_ROUTING) += q6routing.o
+obj-$(CONFIG_SND_SOC_QDSP6_ASM) += q6asm.o
+obj-$(CONFIG_SND_SOC_QDSP6_ASM_DAI) += q6asm-dai.o
+>>>>>>>