From 878611c448e063563e6174a28181b97e466ee894 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 12 Aug 2010 12:38:21 +0100 Subject: [PATCH] --- yaml --- r: 217929 b: refs/heads/master c: 5fe82c5ee1ba2d04183c376038c5d233a0311ec9 h: refs/heads/master i: 217927: 1eb27e11eeec61d1048979663a62ade695d44b1b v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_overlay.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a20d6bf0941b..16f8964c92ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8dc5d14741dc1ee0074a14b360993a10c2c02d24 +refs/heads/master: 5fe82c5ee1ba2d04183c376038c5d233a0311ec9 diff --git a/trunk/drivers/gpu/drm/i915/intel_overlay.c b/trunk/drivers/gpu/drm/i915/intel_overlay.c index cd0c4bf88b94..5ca7ef01f959 100644 --- a/trunk/drivers/gpu/drm/i915/intel_overlay.c +++ b/trunk/drivers/gpu/drm/i915/intel_overlay.c @@ -689,9 +689,9 @@ static u32 overlay_cmd_reg(struct put_image_params *params) return cmd; } -int intel_overlay_do_put_image(struct intel_overlay *overlay, - struct drm_gem_object *new_bo, - struct put_image_params *params) +static int intel_overlay_do_put_image(struct intel_overlay *overlay, + struct drm_gem_object *new_bo, + struct put_image_params *params) { int ret, tmp_width; struct overlay_registers *regs;