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

Commit da5ff7c3 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "audio-kernel: include sa8155 config"

parents 240d3a32 c3970189
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -25,8 +25,11 @@ endif
ifeq ($(CONFIG_ARCH_HOLI), y)
include $(srctree)/techpack/audio/config/holiauto.conf
endif
ifeq ($(CONFIG_ARCH_SA8155), y)
include $(srctree)/techpack/audio/config/sa8155auto.conf
export
endif
endif

# Use USERINCLUDE when you must reference the UAPI directories only.
USERINCLUDE     += \
                -I$(srctree)/techpack/audio/include/uapi/audio
@@ -66,6 +69,10 @@ ifeq ($(CONFIG_ARCH_HOLI), y)
LINUXINCLUDE    += \
                -include $(srctree)/techpack/audio/config/holiautoconf.h
endif
ifeq ($(CONFIG_ARCH_SA8155), y)
LINUXINCLUDE    += \
                -include $(srctree)/techpack/audio/config/sa8155autoconf.h
endif

obj-y += soc/
obj-y += dsp/
+1 −0
Original line number Diff line number Diff line
@@ -13,3 +13,4 @@ CONFIG_SND_SOC_MSM_STUB=m
CONFIG_SND_SOC_MSM_HDMI_CODEC_RX=m
CONFIG_MSM_QDSP6V2_CODECS=m
CONFIG_SND_EVENT=m
CONFIG_SND_SOC_SA8155=m
+1 −0
Original line number Diff line number Diff line
@@ -17,3 +17,4 @@
#define CONFIG_SND_SOC_MSM_HDMI_CODEC_RX 1
#define CONFIG_MSM_QDSP6V2_CODECS 1
#define CONFIG_SND_EVENT 1
#define CONFIG_SND_SOC_SA8155 1