summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-08-16 09:15:51 +1000
committerDave Airlie <airlied@linux.ie>2006-09-22 05:32:32 +1000
commit78eca43d0391f59c3b1505bb7bd38ff45b650aab (patch)
tree9d2b2fb545e115bd8d2264a7598141c4e4a82382 /drivers/char
parenta1d0fcf5a1cf56ae4711c7e0f857832724a67e8b (diff)
downloadop-kernel-dev-78eca43d0391f59c3b1505bb7bd38ff45b650aab.zip
op-kernel-dev-78eca43d0391f59c3b1505bb7bd38ff45b650aab.tar.gz
drm: fix i965 build bug
Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/drm/i915_dma.c2
1 files changed, 1 insertions, 1 deletions
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 @@ static int i915_emit_box(drm_device_t * dev,
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 {
OpenPOWER on IntegriCloud