From patchwork Wed Jul 14 13:21:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Dietrich X-Patchwork-Id: 111974 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6EDNFTV002827 for ; Wed, 14 Jul 2010 13:23:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757010Ab0GNNVe (ORCPT ); Wed, 14 Jul 2010 09:21:34 -0400 Received: from faui40.informatik.uni-erlangen.de ([131.188.34.40]:45207 "EHLO faui40.informatik.uni-erlangen.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756968Ab0GNNVc (ORCPT ); Wed, 14 Jul 2010 09:21:32 -0400 Received: from faui49q (faui49q.informatik.uni-erlangen.de [131.188.42.68]) by faui40.informatik.uni-erlangen.de (Postfix) with SMTP id 5C0165F0DB; Wed, 14 Jul 2010 15:21:30 +0200 (MEST) Received: by faui49q (sSMTP sendmail emulation); Wed, 14 Jul 2010 15:21:30 +0200 Date: Wed, 14 Jul 2010 15:21:30 +0200 From: Christian Dietrich To: Mauro Carvalho Chehab , Muralidharan Karicheri , Vaibhav Hiremath , Julia Lawall , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: vamos-dev@i4.informatik.uni-erlangen.de Subject: [PATCH 3/4] drivers/media/video: Remove dead CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 14 Jul 2010 13:23:16 +0000 (UTC) diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c index 929073e..4ed51b1 100644 --- a/drivers/media/video/omap/omap_vout.c +++ b/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,