diff mbox series

[SRU,E,6/6] UBUNTU: [Config] SND_INTEL_DSP_CONFIG=m

Message ID 20200407071448.16335-7-hui.wang@canonical.com
State New
Headers show
Series alsa: make the dmic detection align to the mainline kernel-5.6 | expand

Commit Message

Hui Wang April 7, 2020, 7:14 a.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/1871284

Signed-off-by: Hui Wang <hui.wang@canonical.com>
---
 debian.master/config/annotations          | 5 +++++
 debian.master/config/config.common.ubuntu | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index bb736bc403da..af3c4ef1bf74 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -8106,6 +8106,11 @@  CONFIG_SND_HDA_POWER_SAVE_DEFAULT               policy<{'amd64': '1', 'arm64': '
 CONFIG_SND_HDA_RECONFIG                         note<allows fixes to be tested live>
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT               note<LP:1804265>
 
+CONFIG_SND_INTEL_NHLT                           policy<{'amd64': 'y', 'arm64': 'n', 'armhf': 'n', 'i386': 'y', 'ppc64el': 'n'}>
+CONFIG_SND_INTEL_NHLT                           note<LP:1871284>
+CONFIG_SND_INTEL_DSP_CONFIG                     policy<{'amd64': 'm', 'arm64': 'n', 'armhf': 'n', 'i386': 'm', 'ppc64el': 'n'}>
+CONFIG_SND_INTEL_DSP_CONFIG                     note<LP:1871284>
+
 # Menu: Device Drivers >> Sound card support >> Advanced Linux Sound Architecture >> ISA sound devices
 CONFIG_SND_ISA                                  policy<{'i386': 'y'}>
 CONFIG_SND_ADLIB                                policy<{'i386': 'm'}>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 4dbec05c6dbf..3568f6ab9848 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -8881,7 +8881,8 @@  CONFIG_SND_INDIGOIO=m
 CONFIG_SND_INDIGOIOX=m
 CONFIG_SND_INTEL8X0=m
 CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_INTEL_NHLT=m
+CONFIG_SND_INTEL_NHLT=y
+CONFIG_SND_INTEL_DSP_CONFIG=m
 CONFIG_SND_INTERWAVE=m
 CONFIG_SND_INTERWAVE_STB=m
 CONFIG_SND_ISA=y