From 39de22a8175c704334d5802eed573d1e419d0522 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Tue, 26 Jun 2012 13:10:12 -0700
Subject: [PATCH] --- yaml --- r: 318635 b: refs/heads/master c:
 f4d71056482f0c3306aa752fd626883f60deed96 h: refs/heads/master i:   318633:
 5065e055bc7540eccfa064458c11c4b24f4620bd   318631:
 a47ff6a3ebcc525ee62b71a306394464dbec0746 v: v3

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

diff --git a/[refs] b/[refs]
index bc1233dbe19f..75be0dfaf127 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e86fe0d31722090e3bb72a3e8aab70f07e2c6b77
+refs/heads/master: f4d71056482f0c3306aa752fd626883f60deed96
diff --git a/trunk/drivers/gpu/drm/i915/intel_sprite.c b/trunk/drivers/gpu/drm/i915/intel_sprite.c
index 64174c507dd9..b04109789f2e 100644
--- a/trunk/drivers/gpu/drm/i915/intel_sprite.c
+++ b/trunk/drivers/gpu/drm/i915/intel_sprite.c
@@ -85,7 +85,7 @@ ivb_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb,
 		break;
 	default:
 		DRM_DEBUG_DRIVER("bad pixel format, assuming RGBX888\n");
-		sprctl |= DVS_FORMAT_RGBX888;
+		sprctl |= SPRITE_FORMAT_RGBX888;
 		pixel_size = 4;
 		break;
 	}