From 1d51c35a67e66e1bd9b7abbfd8c48c8dfa2cbbc7 Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Date: Wed, 17 Feb 2010 15:01:50 +0200
Subject: [PATCH] --- yaml --- r: 184879 b: refs/heads/master c:
 ddbfeb396eb085e17f5aa830a151d546f16cb868 h: refs/heads/master i:   184877:
 a7b64132106473b9de34588be89d4811d9668efe   184875:
 218e5d6089ea5db4e0520b1f70a9a66f79dc0bb1   184871:
 5e2b862927e7315e7b5ec8be6e813f74caf46ae9   184863:
 5576538fdea5c3a763f79af3c8a9cd2461fcf745 v: v3

---
 [refs]                                         |  2 +-
 trunk/drivers/video/omap2/omapfb/Kconfig       |  9 ---------
 trunk/drivers/video/omap2/omapfb/omapfb-main.c | 17 +++--------------
 3 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index eb704862e18c..3bf1c938cb86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 942a91a6e04e996c32252bc6c2177f74089d7a1d
+refs/heads/master: ddbfeb396eb085e17f5aa830a151d546f16cb868
diff --git a/trunk/drivers/video/omap2/omapfb/Kconfig b/trunk/drivers/video/omap2/omapfb/Kconfig
index 5effa1d4d0e6..43496d6c377f 100644
--- a/trunk/drivers/video/omap2/omapfb/Kconfig
+++ b/trunk/drivers/video/omap2/omapfb/Kconfig
@@ -18,15 +18,6 @@ config FB_OMAP2_DEBUG_SUPPORT
 	  Support for debug output. You have to enable the actual printing
 	  with 'debug' module parameter.
 
-config FB_OMAP2_FORCE_AUTO_UPDATE
-	bool "Force main display to automatic update mode"
-	depends on FB_OMAP2
-	help
-	  Forces main display to automatic update mode (if possible),
-	  and also enables tearsync (if possible). By default
-	  displays that support manual update are started in manual
-	  update mode.
-
 config FB_OMAP2_NUM_FBS
 	int "Number of framebuffers"
 	range 1 10
diff --git a/trunk/drivers/video/omap2/omapfb/omapfb-main.c b/trunk/drivers/video/omap2/omapfb/omapfb-main.c
index 8aed12a1ce2f..e3a1730df5fd 100644
--- a/trunk/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/trunk/drivers/video/omap2/omapfb/omapfb-main.c
@@ -2194,9 +2194,7 @@ static int omapfb_probe(struct platform_device *pdev)
 
 	if (def_display) {
 		struct omap_dss_driver *dssdrv = def_display->driver;
-#ifndef CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE
-		u16 w, h;
-#endif
+
 		r = def_display->driver->enable(def_display);
 		if (r) {
 			dev_warn(fbdev->dev, "Failed to enable display '%s'\n",
@@ -2204,25 +2202,16 @@ static int omapfb_probe(struct platform_device *pdev)
 			goto cleanup;
 		}
 
-		/* set the update mode */
 		if (def_display->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) {
-#ifdef CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE
+			u16 w, h;
 			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);
 
-			dssdrv->get_resolution(def_display,
-					&w, &h);
+			dssdrv->get_resolution(def_display, &w, &h);
 			def_display->driver->update(def_display, 0, 0, w, h);
-#endif
 		} else {
 			if (dssdrv->set_update_mode)
 				dssdrv->set_update_mode(def_display,