summarylogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorgraysky2019-11-27 17:15:53 -0500
committergraysky2019-11-27 17:15:53 -0500
commit550becfc78b0b6e0c7f8cdedb00dc975ef898476 (patch)
tree0e776e9b2adfd97ac26141c02f96389d264f4e00 /config
parent8acdfa8cbc2aca4658ddb196464646cf38231eb9 (diff)
downloadaur-550becfc78b0b6e0c7f8cdedb00dc975ef898476.tar.gz
Update to 5.4-2
Diffstat (limited to 'config')
-rw-r--r--config10
1 files changed, 4 insertions, 6 deletions
diff --git a/config b/config
index a07b30e3ab1..0280d6f7858 100644
--- a/config
+++ b/config
@@ -4146,7 +4146,7 @@ CONFIG_RMI4_F11=y
CONFIG_RMI4_F12=y
CONFIG_RMI4_F30=y
CONFIG_RMI4_F34=y
-CONFIG_RMI4_F54=y
+# CONFIG_RMI4_F54 is not set
CONFIG_RMI4_F55=y
#
@@ -6759,7 +6759,7 @@ CONFIG_SND_YMFPCI=m
#
CONFIG_SND_HDA=m
CONFIG_SND_HDA_INTEL=m
-# CONFIG_SND_HDA_INTEL_DETECT_DMIC is not set
+CONFIG_SND_HDA_INTEL_DETECT_DMIC=y
CONFIG_SND_HDA_HWDEP=y
CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_INPUT_BEEP=y
@@ -6930,10 +6930,8 @@ CONFIG_SND_SOC_SOF_INTEL_PCI=m
CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m
CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m
CONFIG_SND_SOC_SOF_INTEL_COMMON=m
-CONFIG_SND_SOC_SOF_BAYTRAIL_SUPPORT=y
-CONFIG_SND_SOC_SOF_BAYTRAIL=m
-CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT=y
-CONFIG_SND_SOC_SOF_BROADWELL=m
+# CONFIG_SND_SOC_SOF_BAYTRAIL_SUPPORT is not set
+# CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT is not set
CONFIG_SND_SOC_SOF_MERRIFIELD_SUPPORT=y
CONFIG_SND_SOC_SOF_MERRIFIELD=m
CONFIG_SND_SOC_SOF_APOLLOLAKE_SUPPORT=y