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

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

Merge "defconfig: sa415m: switch to modular drivers"

parents c1190b3c 33f7bb6d

arch/arm/configs/sa415m-perf_defconfig

+4 −4
Original line number Diff line number Diff line
@@ -289,12 +289,12 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y 
CONFIG_REGULATOR_QPNP=y

CONFIG_REGULATOR_RPMH=y

# CONFIG_VGA_ARB is not set

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SOUND=m

CONFIG_SND=m

CONFIG_SND_DYNAMIC_MINORS=y

# CONFIG_SND_USB is not set

CONFIG_SND_SOC=y

CONFIG_SND_SOC_TLV320AIC3X=y

CONFIG_SND_SOC=m

CONFIG_SND_SOC_TLV320AIC3X=m

# CONFIG_HID_GENERIC is not set

CONFIG_USB=y

CONFIG_USB_DWC3=y

arch/arm/configs/sa415m_defconfig

+4 −4
Original line number Diff line number Diff line
@@ -295,12 +295,12 @@ 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_USB is not set

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