[utopic 1/1] UBUNTU: [Config] CONFIG_DRM_BOCHS=n

[Andy Whitcroft]

BugLink: http://bugs.launchpad.net/bugs/1378648
Signed-off-by: Andy Whitcroft <apw at canonical.com>
---
 debian.master/abi/3.16.0-22.29/amd64/generic.modules          | 1 -
 debian.master/abi/3.16.0-22.29/amd64/lowlatency.modules       | 1 -
 debian.master/abi/3.16.0-22.29/arm64/generic.modules          | 1 -
 debian.master/abi/3.16.0-22.29/armhf/generic-lpae.modules     | 1 -
 debian.master/abi/3.16.0-22.29/armhf/generic.modules          | 1 -
 debian.master/abi/3.16.0-22.29/i386/generic.modules           | 1 -
 debian.master/abi/3.16.0-22.29/i386/lowlatency.modules        | 1 -
 debian.master/abi/3.16.0-22.29/powerpc/powerpc-e500mc.modules | 1 -
 debian.master/abi/3.16.0-22.29/powerpc/powerpc-smp.modules    | 1 -
 debian.master/abi/3.16.0-22.29/powerpc/powerpc64-emb.modules  | 1 -
 debian.master/abi/3.16.0-22.29/powerpc/powerpc64-smp.modules  | 1 -
 debian.master/abi/3.16.0-22.29/ppc64el/generic.modules        | 1 -
 debian.master/config/config.common.ubuntu                     | 2 +-
 13 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/debian.master/abi/3.16.0-22.29/amd64/generic.modules b/debian.master/abi/3.16.0-22.29/amd64/generic.modules
index 88e6fde..1c148ee 100644
--- a/debian.master/abi/3.16.0-22.29/amd64/generic.modules
+++ b/debian.master/abi/3.16.0-22.29/amd64/generic.modules
@@ -433,7 +433,6 @@ bnx2
 bnx2fc
 bnx2i
 bnx2x
-bochs-drm
 bonding
 bpa10x
 bpck
diff --git a/debian.master/abi/3.16.0-22.29/amd64/lowlatency.modules b/debian.master/abi/3.16.0-22.29/amd64/lowlatency.modules
index 721e4dc..67118153 100644
--- a/debian.master/abi/3.16.0-22.29/amd64/lowlatency.modules
+++ b/debian.master/abi/3.16.0-22.29/amd64/lowlatency.modules
@@ -433,7 +433,6 @@ bnx2
 bnx2fc
 bnx2i
 bnx2x
-bochs-drm
 bonding
 bpa10x
 bpck
diff --git a/debian.master/abi/3.16.0-22.29/arm64/generic.modules b/debian.master/abi/3.16.0-22.29/arm64/generic.modules
index 4d6b5163..1a4636c 100644
--- a/debian.master/abi/3.16.0-22.29/arm64/generic.modules
+++ b/debian.master/abi/3.16.0-22.29/arm64/generic.modules
@@ -393,7 +393,6 @@ bnx2
 bnx2fc
 bnx2i
 bnx2x
-bochs-drm
 bonding
 bpa10x
 bpctl_mod
diff --git a/debian.master/abi/3.16.0-22.29/armhf/generic-lpae.modules b/debian.master/abi/3.16.0-22.29/armhf/generic-lpae.modules
index 1838198..8cfd718 100644
--- a/debian.master/abi/3.16.0-22.29/armhf/generic-lpae.modules
+++ b/debian.master/abi/3.16.0-22.29/armhf/generic-lpae.modules
@@ -398,7 +398,6 @@ bnx2
 bnx2fc
 bnx2i
 bnx2x
-bochs-drm
 bonding
 bpa10x
 bpck
diff --git a/debian.master/abi/3.16.0-22.29/armhf/generic.modules b/debian.master/abi/3.16.0-22.29/armhf/generic.modules
index 773a99d..0eda258 100644
--- a/debian.master/abi/3.16.0-22.29/armhf/generic.modules
+++ b/debian.master/abi/3.16.0-22.29/armhf/generic.modules
@@ -396,7 +396,6 @@ bnx2
 bnx2fc
 bnx2i
 bnx2x
-bochs-drm
 bonding
 bpa10x
 bpck
diff --git a/debian.master/abi/3.16.0-22.29/i386/generic.modules b/debian.master/abi/3.16.0-22.29/i386/generic.modules
index e4d0af1..da99dee 100644
--- a/debian.master/abi/3.16.0-22.29/i386/generic.modules
+++ b/debian.master/abi/3.16.0-22.29/i386/generic.modules
@@ -450,7 +450,6 @@ bnx2
 bnx2fc
 bnx2i
 bnx2x
-bochs-drm
 bonding
 bpa10x
 bpck
diff --git a/debian.master/abi/3.16.0-22.29/i386/lowlatency.modules b/debian.master/abi/3.16.0-22.29/i386/lowlatency.modules
index c3d364a..e0715c4 100644
--- a/debian.master/abi/3.16.0-22.29/i386/lowlatency.modules
+++ b/debian.master/abi/3.16.0-22.29/i386/lowlatency.modules
@@ -450,7 +450,6 @@ bnx2
 bnx2fc
 bnx2i
 bnx2x
-bochs-drm
 bonding
 bpa10x
 bpck
diff --git a/debian.master/abi/3.16.0-22.29/powerpc/powerpc-e500mc.modules b/debian.master/abi/3.16.0-22.29/powerpc/powerpc-e500mc.modules
index 6f44f13..d038851 100644
--- a/debian.master/abi/3.16.0-22.29/powerpc/powerpc-e500mc.modules
+++ b/debian.master/abi/3.16.0-22.29/powerpc/powerpc-e500mc.modules
@@ -406,7 +406,6 @@ bnx2
 bnx2fc
 bnx2i
 bnx2x
-bochs-drm
 bonding
 bpa10x
 bpck
diff --git a/debian.master/abi/3.16.0-22.29/powerpc/powerpc-smp.modules b/debian.master/abi/3.16.0-22.29/powerpc/powerpc-smp.modules
index 1e2618c..81f6fa4 100644
--- a/debian.master/abi/3.16.0-22.29/powerpc/powerpc-smp.modules
+++ b/debian.master/abi/3.16.0-22.29/powerpc/powerpc-smp.modules
@@ -414,7 +414,6 @@ bnx2
 bnx2fc
 bnx2i
 bnx2x
-bochs-drm
 bonding
 bpa10x
 bpck
diff --git a/debian.master/abi/3.16.0-22.29/powerpc/powerpc64-emb.modules b/debian.master/abi/3.16.0-22.29/powerpc/powerpc64-emb.modules
index e46cb1c..5c5e090 100644
--- a/debian.master/abi/3.16.0-22.29/powerpc/powerpc64-emb.modules
+++ b/debian.master/abi/3.16.0-22.29/powerpc/powerpc64-emb.modules
@@ -399,7 +399,6 @@ bnx2
 bnx2fc
 bnx2i
 bnx2x
-bochs-drm
 bonding
 bpa10x
 bpck
diff --git a/debian.master/abi/3.16.0-22.29/powerpc/powerpc64-smp.modules b/debian.master/abi/3.16.0-22.29/powerpc/powerpc64-smp.modules
index 116937d..1b125c0 100644
--- a/debian.master/abi/3.16.0-22.29/powerpc/powerpc64-smp.modules
+++ b/debian.master/abi/3.16.0-22.29/powerpc/powerpc64-smp.modules
@@ -404,7 +404,6 @@ bnx2
 bnx2fc
 bnx2i
 bnx2x
-bochs-drm
 bonding
 bpa10x
 bpck
diff --git a/debian.master/abi/3.16.0-22.29/ppc64el/generic.modules b/debian.master/abi/3.16.0-22.29/ppc64el/generic.modules
index 9b37c61..857822e 100644
--- a/debian.master/abi/3.16.0-22.29/ppc64el/generic.modules
+++ b/debian.master/abi/3.16.0-22.29/ppc64el/generic.modules
@@ -390,7 +390,6 @@ bnx2
 bnx2fc
 bnx2i
 bnx2x
-bochs-drm
 bonding
 bpa10x
 bpck
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 097b047..355132e 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1671,7 +1671,7 @@ CONFIG_DRAGONRISE_FF=y
 CONFIG_DRM=m
 CONFIG_DRM_ARMADA=m
 CONFIG_DRM_AST=m
-CONFIG_DRM_BOCHS=m
+# CONFIG_DRM_BOCHS is not set
 CONFIG_DRM_CIRRUS_QEMU=m
 CONFIG_DRM_EXYNOS=m
 # CONFIG_DRM_EXYNOS_DMABUF is not set
-- 
2.1.0