[SRU][OEM-OSP1][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.oem-osp1/config/annotations          | 3 ++-
 debian.oem-osp1/config/config.common.ubuntu | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian.oem-osp1/config/annotations b/debian.oem-osp1/config/annotations
index f1a45643e502..8afd07793266 100644
--- a/debian.oem-osp1/config/annotations
+++ b/debian.oem-osp1/config/annotations
@@ -7975,7 +7975,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', 's390x': 'y'}>
+CONFIG_SOUNDWIRE                                mark<ENFORCED> note<LP:1855685>
+CONFIG_SOUNDWIRE                                policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_SOUNDWIRE_INTEL                          policy<{'amd64': 'm', 'i386': 'm'}>
 
 # Menu: Device Drivers >> Staging drivers
diff --git a/debian.oem-osp1/config/config.common.ubuntu b/debian.oem-osp1/config/config.common.ubuntu
index 18edb714030c..0b476b1023d0 100644
--- a/debian.oem-osp1/config/config.common.ubuntu
+++ b/debian.oem-osp1/config/config.common.ubuntu
@@ -7043,7 +7043,7 @@ CONFIG_SONYPI_COMPAT=y
 CONFIG_SONY_FF=y
 CONFIG_SONY_LAPTOP=m
 CONFIG_SOUND=m
-CONFIG_SOUNDWIRE=y
+CONFIG_SOUNDWIRE=m
 CONFIG_SOUNDWIRE_CADENCE=m
 CONFIG_SOUNDWIRE_INTEL=m
 CONFIG_SOUND_OSS_CORE=y
-- 
2.17.1