[PATCH][linux-aws/Xenial] UBUNTU: aws: [Config] make CONFIG_BLK_DEV_NVME, NVMEM builtin

[Kamal Mostafa]

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

Required for support of hibernation to nvme devices.

Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
 debian.aws/abi/4.4.0-1078.88/amd64/aws.modules | 2 --
 debian.aws/config/config.common.ubuntu         | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian.aws/abi/4.4.0-1078.88/amd64/aws.modules b/debian.aws/abi/4.4.0-1078.88/amd64/aws.modules
index 9c95d3777b68..d9f6d5a8edce 100644
--- a/debian.aws/abi/4.4.0-1078.88/amd64/aws.modules
+++ b/debian.aws/abi/4.4.0-1078.88/amd64/aws.modules
@@ -1744,8 +1744,6 @@ ntfs
 null_blk
 nv_tco
 nvidiafb
-nvme
-nvmem_core
 nvram
 nxp-nci
 nxp-nci_i2c
diff --git a/debian.aws/config/config.common.ubuntu b/debian.aws/config/config.common.ubuntu
index 6ce736dc849d..0b1a596fd1a4 100644
--- a/debian.aws/config/config.common.ubuntu
+++ b/debian.aws/config/config.common.ubuntu
@@ -477,7 +477,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_NVME_SCSI=y
 CONFIG_BLK_DEV_OSD=m
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
@@ -3352,7 +3352,7 @@ CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
 # CONFIG_NUMA_EMU is not set
 CONFIG_NVDIMM_PFN=y
 CONFIG_NVM=y
-CONFIG_NVMEM=m
+CONFIG_NVMEM=y
 # CONFIG_NVME_VENDOR_EXT_GOOGLE is not set
 # CONFIG_NVM_DEBUG is not set
 CONFIG_NVM_GENNVM=m
-- 
2.17.1