[PATCH][Impish] UBUNTU: [Config] CONFIG_MICROSOFT_MANA=y

[Tim Gardner]

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

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 debian.azure/abi/amd64/azure.modules     | 1 -
 debian.azure/config/annotations          | 3 +++
 debian.azure/config/config.common.ubuntu | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian.azure/abi/amd64/azure.modules b/debian.azure/abi/amd64/azure.modules
index aeccd5e336aa..d6cc653e42f0 100644
--- a/debian.azure/abi/amd64/azure.modules
+++ b/debian.azure/abi/amd64/azure.modules
@@ -1150,7 +1150,6 @@ macvtap
 madera
 madera-i2c
 madera-spi
-mana
 marvell-88x2222
 marvell10g
 matrix-keymap
diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations
index 745091a20292..76694a619f32 100644
--- a/debian.azure/config/annotations
+++ b/debian.azure/config/annotations
@@ -4,6 +4,9 @@
 
 include "../../debian.master/config/annotations"
 
+CONFIG_MICROSOFT_MANA                           policy<{'amd64': 'y'}>
+CONFIG_MICROSOFT_MANA                           mark<ENFORCED> note<LP:1949357>
+
 CONFIG_ACCESSIBILITY                            policy<{'amd64': 'n'}>
 
 CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES   policy<{'amd64': '-'}>
diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu
index ce47f5ed640a..9af32239d1d0 100644
--- a/debian.azure/config/config.common.ubuntu
+++ b/debian.azure/config/config.common.ubuntu
@@ -3095,7 +3095,7 @@ CONFIG_MICROCODE_AMD=y
 CONFIG_MICROCODE_INTEL=y
 CONFIG_MICROCODE_OLD_INTERFACE=y
 # CONFIG_MICROSEMI_PHY is not set
-CONFIG_MICROSOFT_MANA=m
+CONFIG_MICROSOFT_MANA=y
 CONFIG_MIGRATION=y
 CONFIG_MII=m
 CONFIG_MINIX_FS=m
-- 
2.33.1