[PATCH Xenial SRU] UBUNTU: [Config] CONFIG_BLK_DEV_RAM=m

[Tim Gardner]

BugLink: http://bugs.launchpad.net/bugs/1593293

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---

I can't think of a good reason for this driver to be built-in.

 debian.master/config/annotations               | 3 ++-
 debian.master/config/config.common.ubuntu      | 2 +-
 debian.master/control.d/generic.inclusion-list | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 18e8e0f..964879c 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -510,11 +510,12 @@ CONFIG_PARIDE_ON20                              policy<{'amd64': 'm', 'armhf': '
 CONFIG_PARIDE_ON26                              policy<{'amd64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
 
 # Menu: Device Drivers >> Block devices >> RAM block device support
-CONFIG_BLK_DEV_RAM                              policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
+CONFIG_BLK_DEV_RAM                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_BLK_DEV_RAM_COUNT                        policy<{'amd64': '16', 'arm64': '16', 'armhf': '16', 'i386': '16', 'powerpc': '16', 'ppc64el': '16', 's390x': '16'}>
 CONFIG_BLK_DEV_RAM_SIZE                         policy<{'amd64': '65536', 'arm64': '65536', 'armhf': '65536', 'i386': '65536', 'powerpc': '65536', 'ppc64el': '65536', 's390x': '65536'}>
 CONFIG_BLK_DEV_RAM_DAX                          policy<{'amd64': 'y', 'arm64': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 #
+CONFIG_BLK_DEV_RAM				note<LP #1593293>
 CONFIG_BLK_DEV_RAM_SIZE                         mark<ENFORCED> note<Ramdisk size should be a minimum of 64M> flag<REVIEW>
 
 # Menu: Device Drivers >> Block devices >> Support for DASD devices
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index df20f79..e024c7b 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -877,7 +877,7 @@ CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_NVME_SCSI=y
 CONFIG_BLK_DEV_OSD=m
 CONFIG_BLK_DEV_PMEM=m
-CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_DAX=y
 CONFIG_BLK_DEV_RAM_SIZE=65536
diff --git a/debian.master/control.d/generic.inclusion-list b/debian.master/control.d/generic.inclusion-list
index 5d2160e..85355191 100644
--- a/debian.master/control.d/generic.inclusion-list
+++ b/debian.master/control.d/generic.inclusion-list
@@ -13,6 +13,7 @@ drivers/ata/ahci.ko
 drivers/ata/acard-ahci.ko
 drivers/ata/libahci.ko
 drivers/ata/libahci_platform.ko
+drivers/block/brd.ko
 drivers/block/nbd.ko
 drivers/block/floppy.ko
 drivers/block/cryptoloop.ko
-- 
2.7.4