From 312d736b13529bff4c72b90c475d1fc6ee512b6a Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Wed, 14 Jul 2010 10:21:30 -0300 Subject: [PATCH] --- yaml --- r: 202107 b: refs/heads/master c: 1e687528777acab2c73cd12fb35d71088ad73a3c h: refs/heads/master i: 202105: 8cc83307f5895925e3cef72b92e349e5a3f3e303 202103: 4ad655f8ae53b419b3b3a9c4ef0a528a0cc423ec v: v3 --- [refs] | 2 +- trunk/drivers/media/video/omap/omap_vout.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index f79fee9b7059..6dcdede25c04 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: abf84383ecadc8ada1963f9976e887c6f0b1bad9 +refs/heads/master: 1e687528777acab2c73cd12fb35d71088ad73a3c diff --git a/trunk/drivers/media/video/omap/omap_vout.c b/trunk/drivers/media/video/omap/omap_vout.c index 929073e792c9..4ed51b1552e1 100644 --- a/trunk/drivers/media/video/omap/omap_vout.c +++ b/trunk/drivers/media/video/omap/omap_vout.c @@ -2545,19 +2545,11 @@ static int __init omap_vout_probe(struct platform_device *pdev) /* set the update mode */ if (def_display->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) { -#ifdef CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE - if (dssdrv->enable_te) - dssdrv->enable_te(def_display, 1); - if (dssdrv->set_update_mode) - dssdrv->set_update_mode(def_display, - OMAP_DSS_UPDATE_AUTO); -#else /* MANUAL_UPDATE */ if (dssdrv->enable_te) dssdrv->enable_te(def_display, 0); if (dssdrv->set_update_mode) dssdrv->set_update_mode(def_display, OMAP_DSS_UPDATE_MANUAL); -#endif } else { if (dssdrv->set_update_mode) dssdrv->set_update_mode(def_display,