From: Andrew Morton <akpm@osdl.org>

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

 drivers/char/drm/i915_dma.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/char/drm/i915_dma.c~git-drm-build-fix drivers/char/drm/i915_dma.c
--- a/drivers/char/drm/i915_dma.c~git-drm-build-fix
+++ a/drivers/char/drm/i915_dma.c
@@ -404,7 +404,7 @@ static int i915_emit_box(drm_device_t * 
 		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 {
_