commit 78eca43d0391f59c3b1505bb7bd38ff45b650aab
author Andrew Morton <akpm@osdl.org> Wed Aug 16 09:15:51 2006 +1000
committer Dave Airlie <airlied@linux.ie> Fri Sep 22 05:32:32 2006 +1000
tree 9d2b2fb545e115bd8d2264a7598141c4e4a82382
parent a1d0fcf5a1cf56ae4711c7e0f857832724a67e8b

drm: fix i965 build bug

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Dave Airlie <airlied@linux.ie>

drivers/char/drm/i915_dma.c

diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c
index 99e9d07..d932f80 100644
--- a/drivers/char/drm/i915_dma.c
+++ b/drivers/char/drm/i915_dma.c
@@ -404,7 +404,7 @@
 		BEGIN_LP_RING(4);
 		OUT_RING(GFX_OP_DRAWRECT_INFO_I965);
 		OUT_RING((box.x1 & 0xffff) | (box.y1 << 16));
-		OUT_RING(((box.x2 - 1) & 0xffff) ((box.y2 - 1) << 16));
+		OUT_RING(((box.x2 - 1) & 0xffff) | ((box.y2 - 1) << 16));
 		OUT_RING(DR4);
 		ADVANCE_LP_RING();
 	} else {