---

yaml --- r: 284911 b: refs/heads/master c: 550a8f6 h: refs/heads/master i: 284909: 1db9ed4 284907: a90658d 284903: 69804a7 284895: b561464 v: v3
git-mirror · Dec 2, 2011 · 03df3c1 · 03df3c1
1 parent 3af3cee
commit 03df3c1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3f96fee1eb8d541b4b5bb841f57bd453c70f12d
+refs/heads/master: 550a8f646c76f27ede10265b8e4c9d54c9f4af27
diff --git a/trunk/drivers/video/omap2/dss/overlay.c b/trunk/drivers/video/omap2/dss/overlay.c
@@ -548,11 +548,6 @@ static void dss_ovl_get_overlay_info(struct omap_overlay *ovl,
 	*info = ovl->info;
 }
 
-static int dss_ovl_wait_for_go(struct omap_overlay *ovl)
-{
-	return dss_mgr_wait_for_go_ovl(ovl);
-}
-
 static int omap_dss_set_manager(struct omap_overlay *ovl,
 		struct omap_overlay_manager *mgr)
 {
@@ -689,7 +684,7 @@ void dss_init_overlays(struct platform_device *pdev)
 		ovl->unset_manager = &omap_dss_unset_manager;
 		ovl->set_overlay_info = &dss_ovl_set_overlay_info;
 		ovl->get_overlay_info = &dss_ovl_get_overlay_info;
-		ovl->wait_for_go = &dss_ovl_wait_for_go;
+		ovl->wait_for_go = &dss_mgr_wait_for_go_ovl;
 
 		ovl->caps = dss_feat_get_overlay_caps(ovl->id);
 		ovl->supported_modes =