[PATCH 1/1][F/gcp] UBUNTU: [config] gcp: enable BLK_DEV_NVME=y

[Khalid Elmously]

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

Fixed whitespace while in there

Signed-off-by: Khalid Elmously <khalid.elmously at canonical.com>
---
 debian.gcp/config/annotations          | 8 ++++++--
 debian.gcp/config/config.common.ubuntu | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian.gcp/config/annotations b/debian.gcp/config/annotations
index 0f701aed23ce..41b0765899c7 100644
--- a/debian.gcp/config/annotations
+++ b/debian.gcp/config/annotations
@@ -103,5 +103,9 @@ CONFIG_SND_SOC_AMD_RENOIR                       policy<{'amd64': 'n'}>
 CONFIG_SND_SOC_AMD_RENOIR                       note<Unnecessary for linux-gcp>
 CONFIG_SND_SOC_AMD_RENOIR_MACH                  policy<{'amd64': 'n'}>
 CONFIG_SND_SOC_AMD_RENOIR_MACH                  note<Unnecessary for linux-gcp>
-CONFIG_ATARI_PARTITION                             policy<{'amd64': 'n'}>
-CONFIG_ATARI_PARTITION                             mark<ENFORCED> note<LP:1908264>
+
+CONFIG_ATARI_PARTITION                          policy<{'amd64': 'n'}>
+CONFIG_ATARI_PARTITION                          mark<ENFORCED> note<LP:1908264>
+
+CONFIG_BLK_DEV_NVME                             policy<{'amd64': 'y'}>
+CONFIG_BLK_DEV_NVME                             mark<ENFORCED> note<Needed for minimal images>
diff --git a/debian.gcp/config/config.common.ubuntu b/debian.gcp/config/config.common.ubuntu
index 9e1723f18972..629cc3d26368 100644
--- a/debian.gcp/config/config.common.ubuntu
+++ b/debian.gcp/config/config.common.ubuntu
@@ -671,7 +671,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 CONFIG_BLK_DEV_MD=y
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_NULL_BLK=m
-CONFIG_BLK_DEV_NVME=m
+CONFIG_BLK_DEV_NVME=y
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 CONFIG_BLK_DEV_PMEM=m
 CONFIG_BLK_DEV_RAM=m
@@ -5100,7 +5100,7 @@ CONFIG_NVDIMM_PFN=y
 CONFIG_NVM=y
 CONFIG_NVMEM=y
 CONFIG_NVMEM_SYSFS=y
-CONFIG_NVME_CORE=m
+CONFIG_NVME_CORE=y
 CONFIG_NVME_FABRICS=m
 CONFIG_NVME_FC=m
 CONFIG_NVME_MULTIPATH=y
-- 
2.17.1