From bf98cb3c2a1377c649a7abdcf211c3031a075b63 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Thu, 28 Jan 2010 16:13:29 -0800
Subject: [PATCH] --- yaml --- r: 185617 b: refs/heads/master c:
 faa7bde6cb1227d13d011042f17bda0869c3bd1e h: refs/heads/master i:   185615:
 ab1d67c37ce028f13ffc206c6e0000e978d8e16c v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_drv.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index acf5f5cc17ae..50d9c41feb5c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9201c14d9c22fb3b3f313f69ee4f967353ca960
+refs/heads/master: faa7bde6cb1227d13d011042f17bda0869c3bd1e
diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.c b/trunk/drivers/gpu/drm/i915/i915_drv.c
index 94e74a426ef9..2a9178bb2748 100644
--- a/trunk/drivers/gpu/drm/i915/i915_drv.c
+++ b/trunk/drivers/gpu/drm/i915/i915_drv.c
@@ -138,13 +138,11 @@ const static struct intel_device_info intel_ironlake_m_info = {
 
 const static struct intel_device_info intel_sandybridge_d_info = {
 	.is_i965g = 1, .is_i9xx = 1, .need_gfx_hws = 1,
-	.has_pipe_cxsr = 1,
 	.has_hotplug = 1,
 };
 
 const static struct intel_device_info intel_sandybridge_m_info = {
-	.is_i965g = 1, .is_i9xx = 1, .need_gfx_hws = 1,
-	.has_pipe_cxsr = 1,
+	.is_i965g = 1, .is_mobile = 1, .is_i9xx = 1, .need_gfx_hws = 1,
 	.has_hotplug = 1,
 };