Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31435db6 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: audio: fix compile error for ferrum"

parents a3baab4b 77813bcd
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -95,6 +95,9 @@ config ARCH_MSMFERRUM
	select ARM_TICKET_LOCKS
	select ARM_HAS_SG_CHAIN
	select ARCH_WANT_KMAP_ATOMIC_FLUSH
	select MSM_QDSP6_APRV3
	select MSM_QDSP6V2_CODECS
	select MSM_AUDIO_QDSP6V2 if SND_SOC

config ARCH_MSM8916
	bool "MSM8916"
+2 −0
Original line number Diff line number Diff line
@@ -101,6 +101,8 @@ obj-$(CONFIG_WCD9330_CODEC) += wcd9xxx-core.o wcd9xxx-irq.o wcd9xxx-slimslave.o\
						wcd9xxx-core-resource.o
obj-$(CONFIG_SND_SOC_MSM8X16_WCD)	+= wcd9xxx-core.o wcd9xxx-irq.o\
						wcd9xxx-slimslave.o wcd9xxx-core-resource.o
obj-$(CONFIG_SND_SOC_MSMFERRUM_WCD)	+= wcd9xxx-core.o wcd9xxx-irq.o\
						wcd9xxx-slimslave.o wcd9xxx-core-resource.o

ifeq ($(CONFIG_SA1100_ASSABET),y)
obj-$(CONFIG_MCP_UCB1200)	+= ucb1x00-assabet.o
+2 −0
Original line number Diff line number Diff line
@@ -79,6 +79,8 @@ snd-soc-msm8x16-wcd-objs += wcd9330.o wcd9330-tables.o
snd-soc-msm8x16-wcd-objs += wcd_cpe_services.o wcd_cpe_core.o
snd-soc-wcd-cpe-objs := wcd_cpe_services.o wcd_cpe_core.o
snd-soc-msmferrum-wcd-objs := msm8x16-wcd.o msm8x16-wcd-tables.o wcd-mbhc-v2.o
snd-soc-msmferrum-wcd-objs += wcd9xxx-common.o wcd9xxx-resmgr.o wcd9xxx-mbhc.o
snd-soc-msmferrum-wcd-objs += wcd9306.o wcd9306-tables.o
snd-soc-wl1273-objs := wl1273.o
snd-soc-wm-adsp-objs := wm_adsp.o
snd-soc-wm0010-objs := wm0010.o
+2 −0
Original line number Diff line number Diff line
@@ -275,6 +275,8 @@ config SND_SOC_MSMFERRUM
	select SND_SOC_MSM_STUB
	select SND_SOC_MSM_HOSTLESS_PCM
	select SND_SOC_MSMFERRUM_WCD
	select SLIMBUS
	select MFD_CORE
	select SND_DYNAMIC_MINORS
	select QTI_PP
	select DTS_SRS_TM