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

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

Merge "defconfig: switch to DLKM for sound architecture"

parents 90dc6704 e9f68e37

arch/arm/configs/vendor/sa515m-perf_defconfig

+4 −4
Original line number Diff line number Diff line
@@ -281,11 +281,11 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y 
CONFIG_REGULATOR_GPIO=y

CONFIG_REGULATOR_RPMH=y

CONFIG_REGULATOR_STUB=y

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SOUND=m

CONFIG_SND=m

CONFIG_SND_DYNAMIC_MINORS=y

CONFIG_SND_SOC=y

CONFIG_SND_SOC_TLV320AIC3X=y

CONFIG_SND_SOC=m

CONFIG_SND_SOC_TLV320AIC3X=m

CONFIG_UHID=y

CONFIG_HID_APPLE=y

CONFIG_HID_ELECOM=y

arch/arm/configs/vendor/sa515m_defconfig

+4 −4
Original line number Diff line number Diff line
@@ -282,11 +282,11 @@ CONFIG_REGULATOR_GPIO=y 
CONFIG_REGULATOR_RPMH=y

CONFIG_REGULATOR_STUB=y

CONFIG_FB=y

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SOUND=m

CONFIG_SND=m

CONFIG_SND_DYNAMIC_MINORS=y

CONFIG_SND_SOC=y

CONFIG_SND_SOC_TLV320AIC3X=y

CONFIG_SND_SOC=m

CONFIG_SND_SOC_TLV320AIC3X=m

CONFIG_UHID=y

CONFIG_HID_APPLE=y

CONFIG_HID_ELECOM=y

arch/arm/configs/vendor/sdxprairie-perf_defconfig

+3 −3
Original line number Diff line number Diff line
@@ -273,10 +273,10 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y 
CONFIG_REGULATOR_GPIO=y

CONFIG_REGULATOR_RPMH=y

CONFIG_REGULATOR_STUB=y

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SOUND=m

CONFIG_SND=m

CONFIG_SND_DYNAMIC_MINORS=y

CONFIG_SND_SOC=y

CONFIG_SND_SOC=m

CONFIG_UHID=y

CONFIG_HID_APPLE=y

CONFIG_HID_ELECOM=y

arch/arm/configs/vendor/sdxprairie_defconfig

+3 −3
Original line number Diff line number Diff line
@@ -277,10 +277,10 @@ CONFIG_FB=y 
CONFIG_FB_MSM=y

CONFIG_FB_MSM_MDP_NONE=y

CONFIG_FB_MSM_QPIC_PANEL_DETECT=y

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SOUND=m

CONFIG_SND=m

CONFIG_SND_DYNAMIC_MINORS=y

CONFIG_SND_SOC=y

CONFIG_SND_SOC=m

CONFIG_UHID=y

CONFIG_HID_APPLE=y

CONFIG_HID_ELECOM=y

sound/soc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ menuconfig SND_SOC 
	select SND_PCM

	select AC97_BUS if SND_SOC_AC97_BUS

	select SND_JACK

	select SND_TIMER

	select SND_HWDEP

	select SND_SOC_COMPRESS

	select REGMAP_I2C if I2C