---

yaml --- r: 221761 b: refs/heads/master c: 8f28f54 h: refs/heads/master i: 221759: 61fd92e v: v3
git-mirror · Oct 27, 2010 · f39e729 · f39e729
1 parent 7ff07e0
commit f39e729
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd2b379f071424f36f9f90ff83cb4ad058c7b6ed
+refs/heads/master: 8f28f54aad8bcf52a47afb6447fac34f96597b6f
diff --git a/trunk/drivers/gpu/drm/i915/intel_overlay.c b/trunk/drivers/gpu/drm/i915/intel_overlay.c
@@ -946,7 +946,9 @@ static int check_overlay_src(struct drm_device *dev,
 {
 	int uv_hscale = uv_hsubsampling(rec->flags);
 	int uv_vscale = uv_vsubsampling(rec->flags);
-	u32 stride_mask, depth, tmp;
+	u32 stride_mask;
+	int depth;
+	u32 tmp;
 
 	/* check src dimensions */
 	if (IS_845G(dev) || IS_I830(dev)) {