[SRU][Eoan][PATCH 6/6] UBUNTU: [Config] Enable SND_HDA_INTEL_DETECT_DMIC

[Hui Wang]

BugLink: https://bugs.launchpad.net/bugs/1837828

Signed-off-by: Hui Wang <hui.wang at canonical.com>
---
 debian.master/config/annotations          | 4 ++++
 debian.master/config/config.common.ubuntu | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 5daaac920896..cf19d1d69028 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -8078,6 +8078,8 @@ CONFIG_SND_AC97_POWER_SAVE_DEFAULT              policy<{'amd64': '0', 'arm64': '
 
 # Menu: Device Drivers >> Sound card support >> Advanced Linux Sound Architecture >> HD-Audio
 CONFIG_SND_HDA_INTEL                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
+CONFIG_SND_HDA_INTEL_DETECT_DMIC                policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y'}>
+CONFIG_SND_HDA_INTEL_DETECT_DMIC                note<LP:1837828>
 CONFIG_SND_HDA_TEGRA                            policy<{'armhf-generic': 'm'}>
 CONFIG_SND_HDA_HWDEP                            policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y'}>
 CONFIG_SND_HDA_RECONFIG                         policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y'}>
@@ -8215,6 +8217,8 @@ CONFIG_SND_VIA82XX_MODEM                        policy<{'amd64': 'm', 'arm64': '
 CONFIG_SND_VIRTUOSO                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
 CONFIG_SND_VX222                                policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
 CONFIG_SND_YMFPCI                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
+CONFIG_SND_INTEL_NHLT                           policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
+CONFIG_SND_INTEL_NHLT                           note<LP:1837828>
 
 # Menu: Device Drivers >> Sound card support >> Advanced Linux Sound Architecture >> PCMCIA sound devices
 CONFIG_SND_PCMCIA                               policy<{'amd64': 'y', 'i386': 'y'}>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index b8b567f8e01e..db023e6fc676 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -8862,6 +8862,7 @@ CONFIG_SND_HDA_I915=y
 CONFIG_SND_HDA_INPUT_BEEP=y
 CONFIG_SND_HDA_INPUT_BEEP_MODE=0
 CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_INTEL_DETECT_DMIC=y
 CONFIG_SND_HDA_PATCH_LOADER=y
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
 CONFIG_SND_HDA_PREALLOC_SIZE=64
@@ -8881,6 +8882,7 @@ CONFIG_SND_INDIGOIO=m
 CONFIG_SND_INDIGOIOX=m
 CONFIG_SND_INTEL8X0=m
 CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_INTEL_NHLT=m
 CONFIG_SND_INTERWAVE=m
 CONFIG_SND_INTERWAVE_STB=m
 CONFIG_SND_ISA=y
-- 
2.17.1