From 95c60cd18009c2ae110f9ac1305331eac87ae078 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Thu, 8 Dec 2011 10:27:14 +0200 Subject: [PATCH] --- yaml --- r: 284970 b: refs/heads/master c: 5af661ce1a8c7672364c2c911b76186589db0f0e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/apply.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 20763b170968..ce2a0a31ce36 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 04576d415e01aa08752bf3884db9862cfbba9115 +refs/heads/master: 5af661ce1a8c7672364c2c911b76186589db0f0e diff --git a/trunk/drivers/video/omap2/dss/apply.c b/trunk/drivers/video/omap2/dss/apply.c index a3c75f582e1f..f8506d79a7f9 100644 --- a/trunk/drivers/video/omap2/dss/apply.c +++ b/trunk/drivers/video/omap2/dss/apply.c @@ -220,11 +220,9 @@ static int dss_mgr_check_zorder(struct omap_overlay_manager *mgr, struct omap_overlay_info **overlay_infos) { struct omap_overlay *ovl1, *ovl2; - struct ovl_priv_data *op1, *op2; struct omap_overlay_info *info1, *info2; list_for_each_entry(ovl1, &mgr->overlays, list) { - op1 = get_ovl_priv(ovl1); info1 = overlay_infos[ovl1->id]; if (info1 == NULL) @@ -234,7 +232,6 @@ static int dss_mgr_check_zorder(struct omap_overlay_manager *mgr, if (ovl1 == ovl2) continue; - op2 = get_ovl_priv(ovl2); info2 = overlay_infos[ovl2->id]; if (info2 == NULL)