[PATCH] UBUNTU: [Config] azure: CONFIG_BLK_DEV_FD=n

[Tim Gardner]

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

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 16fa9bd7afe1..b886fbad18e7 100644
--- a/debian.azure/abi/amd64/azure.modules
+++ b/debian.azure/abi/amd64/azure.modules
@@ -647,7 +647,6 @@ firmware_attributes_class
 fit2
 fit3
 fixed
-floppy
 fm10k
 fmvj18x_cs
 fore_200e
diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations
index 1de423392ad3..140617cef6ab 100644
--- a/debian.azure/config/annotations
+++ b/debian.azure/config/annotations
@@ -4,6 +4,9 @@
 
 include "../../debian.master/config/annotations"
 
+CONFIG_BLK_DEV_FD                               policy<{'amd64': 'n'}>
+CONFIG_BLK_DEV_FD                               mark<ENFORCED> note<LP: #1972017>
+
 CONFIG_HIBERNATION                              policy<{'amd64': 'y', 'arm64': 'y'}>
 CONFIG_HIBERNATION                              mark<ENFORCED> note<LP:1967336>
 
diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu
index 7adf6d2192c6..ca25a1d05394 100644
--- a/debian.azure/config/config.common.ubuntu
+++ b/debian.azure/config/config.common.ubuntu
@@ -779,7 +779,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_DM=y
 CONFIG_BLK_DEV_DM_BUILTIN=y
 CONFIG_BLK_DEV_DRBD=m
-CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_INTEGRITY_T10=y
-- 
2.36.0