[SRU][unstable][PATCH 1/1] UBUNTU: [config]: SOUNDWIRE=m

[Hui Wang]

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

This can reduce the kernel size, and it is easy to replace the
soundwire bus driver with dkms.

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

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 2a1d944e0f1b..d3f0063cbb0b 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -8355,7 +8355,8 @@ CONFIG_SND_X86                                  policy<{'amd64': 'y', 'i386': 'y
 CONFIG_HDMI_LPE_AUDIO                           policy<{'amd64': 'm', 'i386': 'm'}>
 
 # Menu: Device Drivers >> SoundWire support
-CONFIG_SOUNDWIRE                                policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y'}>
+CONFIG_SOUNDWIRE                                mark<ENFORCED> note<LP:1855685>
+CONFIG_SOUNDWIRE                                policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
 CONFIG_SOUNDWIRE_INTEL                          policy<{'amd64': 'm', 'i386': 'm'}>
 
 # Menu: Device Drivers >> Staging drivers
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index bd22613c4eed..dcfe741c7471 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -9570,7 +9570,7 @@ CONFIG_SONYPI=m
 CONFIG_SONYPI_COMPAT=y
 CONFIG_SONY_FF=y
 CONFIG_SONY_LAPTOP=m
-CONFIG_SOUNDWIRE=y
+CONFIG_SOUNDWIRE=m
 CONFIG_SOUNDWIRE_CADENCE=m
 CONFIG_SOUNDWIRE_INTEL=m
 CONFIG_SOUND_OSS_CORE=y
-- 
2.17.1