From c68d78d13ce40cf967bfe92adf9fec1540e2c054 Mon Sep 17 00:00:00 2001 From: Archit Taneja Date: Mon, 9 Apr 2012 14:36:08 +0530 Subject: [PATCH] --- yaml --- r: 310320 b: refs/heads/master c: b3d795abb253c7605f8b6257f2e25e7ebaaf4b57 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 9ab2f7e57224..9787c861a2d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fcc36619901064a76e15a545ea36d38ba0e54192 +refs/heads/master: b3d795abb253c7605f8b6257f2e25e7ebaaf4b57 diff --git a/trunk/drivers/video/omap2/dss/apply.c b/trunk/drivers/video/omap2/dss/apply.c index 0ffe4e101c56..15c070cc695f 100644 --- a/trunk/drivers/video/omap2/dss/apply.c +++ b/trunk/drivers/video/omap2/dss/apply.c @@ -960,14 +960,11 @@ static void dss_ovl_setup_fifo(struct omap_overlay *ovl, bool use_fifo_merge) { struct ovl_priv_data *op = get_ovl_priv(ovl); - struct omap_dss_device *dssdev; u32 fifo_low, fifo_high; if (!op->enabled && !op->enabling) return; - dssdev = ovl->manager->device; - dispc_ovl_compute_fifo_thresholds(ovl->id, &fifo_low, &fifo_high, use_fifo_merge);