From a75fa6d937877cebe88d37a67d84e9f38cc99e71 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Tue, 13 Jul 2010 13:52:17 +0100
Subject: [PATCH] --- yaml --- r: 205167 b: refs/heads/master c:
 d79613643b4512962b2be5262a09b6694dd96101 h: refs/heads/master i:   205165:
 1edb76c5f5a79cb9f2c90edd4a4af709c284dd4c   205163:
 aacabab47bd11ef264a194f7e7c3b15692638f2d   205159:
 4c51ef6e7d01ec6658a15f0d9422a3b032958ac7   205151:
 bce350a4d04b4d4fd7862c2ce3ef17efdce97e03 v: v3

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

diff --git a/[refs] b/[refs]
index 3c7fa4ec598b..89300d494fc8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1efd14a99483a4fb9308902397ed86b69454c99
+refs/heads/master: d79613643b4512962b2be5262a09b6694dd96101
diff --git a/trunk/drivers/gpu/drm/i915/intel_overlay.c b/trunk/drivers/gpu/drm/i915/intel_overlay.c
index fe05ba27440a..f26ec2f27d36 100644
--- a/trunk/drivers/gpu/drm/i915/intel_overlay.c
+++ b/trunk/drivers/gpu/drm/i915/intel_overlay.c
@@ -65,7 +65,7 @@
 #define OCMD_YUV_410_PLANAR	(0xe<<10) /* also 411 */
 #define OCMD_TVSYNCFLIP_PARITY	(0x1<<9)
 #define OCMD_TVSYNCFLIP_ENABLE	(0x1<<7)
-#define OCMD_BUF_TYPE_MASK	(Ox1<<5)
+#define OCMD_BUF_TYPE_MASK	(0x1<<5)
 #define OCMD_BUF_TYPE_FRAME	(0x0<<5)
 #define OCMD_BUF_TYPE_FIELD	(0x1<<5)
 #define OCMD_TEST_MODE		(0x1<<4)