[PATCH] UBUNTU: [Config] Re-enable CONFIG_DRM_BOCHS

[Timo Aaltonen]

From: Timo Aaltonen <timo.aaltonen at canonical.com>

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

This is required for xserver to work on QEMU with dummy VGA.

Signed-off-by: Timo Aaltonen <timo.aaltonen at canonical.com>
---
 debian.master/config/annotations          | 2 --
 debian.master/config/config.common.ubuntu | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 93813c874627..4d11ae71c875 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -1822,7 +1822,6 @@ CONFIG_DRM_SHMOBILE                             policy<{'armhf': 'm'}>
 CONFIG_DRM_OMAP                                 policy<{'armhf': 'n'}>
 CONFIG_DRM_TILCDC                               policy<{'armhf': 'm'}>
 CONFIG_DRM_QXL                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
-CONFIG_DRM_BOCHS                                policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n'}>
 CONFIG_DRM_VIRTIO_GPU                           policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
 CONFIG_DRM_FSL_DCU                              policy<{'armhf': 'm'}>
 CONFIG_DRM_TEGRA                                policy<{'armhf-generic': 'm'}>
@@ -1848,7 +1847,6 @@ CONFIG_DRM_PL111                                policy<{'arm64': 'm', 'armhf': '
 CONFIG_DRM_TVE200                               policy<{'armhf': 'm'}>
 #
 CONFIG_DRM_MGAG200                              note<LP#1693337>
-CONFIG_DRM_BOCHS                                note<LP#1378648>
 CONFIG_DRM_STI                                  note<LP#1398458>
 
 # Menu: Device Drivers >> Graphics support >> Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) >> AMD GPU
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index bdece4b92c89..e6e1f5d34ea1 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2315,7 +2315,7 @@ CONFIG_DRM_ARM=y
 CONFIG_DRM_ARMADA=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_ATMEL_HLCDC=m
-# CONFIG_DRM_BOCHS is not set
+CONFIG_DRM_BOCHS=m
 CONFIG_DRM_BRIDGE=y
 CONFIG_DRM_CDNS_DSI=m
 CONFIG_DRM_CIRRUS_QEMU=m
-- 
2.17.1