From dea84d3d7e145b96a81f30f91e874faf99b54241 Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thellstrom@vmware.com>
Date: Fri, 9 Nov 2012 12:26:13 +0000
Subject: [PATCH] --- yaml --- r: 345349 b: refs/heads/master c:
 29a16e9543f4122da13e9c0e18af117cc4964fb8 h: refs/heads/master i:   345347:
 be8c2d314f1e5434144c2983f8a01d2bfa425b01 v: v3

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

diff --git a/[refs] b/[refs]
index e963f344f2b5..a3e3e0920865 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dcb522715503dfd3eae4fe402439bd4737434f21
+refs/heads/master: 29a16e9543f4122da13e9c0e18af117cc4964fb8
diff --git a/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c b/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
index 6deaf2f8bab1..60f12855362b 100644
--- a/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
+++ b/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
@@ -485,7 +485,7 @@ int vmw_kms_init_screen_object_display(struct vmw_private *dev_priv)
 		return -EINVAL;
 	}
 
-	if (!(dev_priv->fifo.capabilities & SVGA_FIFO_CAP_SCREEN_OBJECT_2)) {
+	if (!(dev_priv->capabilities & SVGA_CAP_SCREEN_OBJECT_2)) {
 		DRM_INFO("Not using screen objects,"
 			 " missing cap SCREEN_OBJECT_2\n");
 		return -ENOSYS;