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

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

Merge "defconfig: msm8974: Add support for msmsamarium sound"

parents 70d37398 0bed5f42

arch/arm/configs/msm8974-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ CONFIG_THERMAL_MONITOR=y 
CONFIG_THERMAL_QPNP=y

CONFIG_THERMAL_QPNP_ADC_TM=y

CONFIG_WCD9320_CODEC=y

CONFIG_WCD9306_CODEC=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_PROXY_CONSUMER=y

CONFIG_REGULATOR_STUB=y
@@ -361,6 +362,7 @@ CONFIG_SND_USB_AUDIO=y 
CONFIG_SND_SOC=y

CONFIG_SND_SOC_MSM8974=y

CONFIG_SND_SOC_APQ8074=y

CONFIG_SND_SOC_MSMSAMARIUM=y

CONFIG_UHID=y

CONFIG_HID_APPLE=y

CONFIG_HID_MAGICMOUSE=y

arch/arm/configs/msm8974_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ CONFIG_THERMAL_MONITOR=y 
CONFIG_THERMAL_QPNP=y

CONFIG_THERMAL_QPNP_ADC_TM=y

CONFIG_WCD9320_CODEC=y

CONFIG_WCD9306_CODEC=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_PROXY_CONSUMER=y

CONFIG_REGULATOR_STUB=y
@@ -370,6 +371,7 @@ CONFIG_SND=y 
CONFIG_SND_USB_AUDIO=y

CONFIG_SND_SOC=y

CONFIG_SND_SOC_MSM8974=y

CONFIG_SND_SOC_MSMSAMARIUM=y

CONFIG_SND_SOC_MSM_HDMI_CODEC_RX=y

CONFIG_UHID=y

CONFIG_HID_APPLE=y