[B][SRU][PATCHv2 1/1] UBUNTU: [Config] Enable VIMC module

[Po-Hsu Lin]

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

VIMC is a virtual media controller that can emulate a real media device.
This is useful for automated tests, and development of multimedia frameworks.

Signed-off-by: Po-Hsu Lin <po-hsu.lin at canonical.com>
---
 debian.master/config/annotations          | 2 ++
 debian.master/config/config.common.ubuntu | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index e8f17ff..e9a9e15 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -4148,6 +4148,8 @@ CONFIG_VIDEO_VIVID                              policy<{'amd64': 'm', 'arm64': '
 CONFIG_VIDEO_VIVID_CEC                          policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y'}>
 CONFIG_VIDEO_VIVID_MAX_DEVS                     policy<{'amd64': '64', 'arm64': '64', 'armhf': '64', 'i386': '64', 'ppc64el': '64'}>
 CONFIG_VIDEO_VIM2M                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
+#
+CONFIG_VIDEO_VIMC                               note<LP#1831482>
 
 # Menu: Device Drivers >> Multimedia support >> Cameras/video grabbers support >> Memory-to-memory multimedia devices
 CONFIG_V4L_MEM2MEM_DRIVERS                      policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y'}>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 67edc5e..cea83cd 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -10144,7 +10144,7 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_VIDEO_V4L2_TPG=m
 CONFIG_VIDEO_VIA_CAMERA=m
 CONFIG_VIDEO_VIM2M=m
-# CONFIG_VIDEO_VIMC is not set
+CONFIG_VIDEO_VIMC=m
 CONFIG_VIDEO_VIVID=m
 CONFIG_VIDEO_VIVID_CEC=y
 CONFIG_VIDEO_VIVID_MAX_DEVS=64
-- 
2.7.4