diff mbox

[Wily] UBUNTU: [Config] Disable CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT

Message ID 1436515285-12099-1-git-send-email-tjaalton@ubuntu.com
State New
Headers show

Commit Message

Timo Aaltonen July 10, 2015, 8:01 a.m. UTC 
From: Timo Aaltonen <timo.aaltonen@canonical.com>

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

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

Comments

Andy Whitcroft July 10, 2015, 9:03 a.m. UTC | #1 
Looks sane, and appropriatly updates annotations etc.

Applied to wily.

-apw
diff mbox

Patch

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index f89cf83..6820ffc 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -640,7 +640,7 @@  CONFIG_DRM_EXYNOS_IPP				p policy<{'armhf': 'n'}>
 
 # Menu: Device Drivers >> Graphics support >> Direct Rendering Manager >> Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) >> Intel 8xx/9xx/G3x/G4x/HD Graphics
 CONFIG_DRM_I915_FBDEV				y
-CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT		y
+CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT		n note<LP:1473319>
 
 # Menu: Device Drivers >> Graphics support >> Direct Rendering Manager >> Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) >> Intel GMA5/600 KMS Framebuffer
 CONFIG_DRM_GMA600				y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 41be4fe..86e3027 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1785,7 +1785,6 @@  CONFIG_DRM_I810=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_I915_FBDEV=y
 CONFIG_DRM_I915_KMS=y
-CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=y
 CONFIG_DRM_IMX=m
 CONFIG_DRM_IMX_FB_HELPER=m
 CONFIG_DRM_IMX_HDMI=m