From a05964a4f6df5d7896c58fac069ba94974572508 Mon Sep 17 00:00:00 2001
From: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Date: Sat, 23 Apr 2011 22:24:52 +0000
Subject: [PATCH] --- yaml --- r: 247838 b: refs/heads/master c:
 c5a4e6d725654045e548b1a1f33059a44a06910f h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/video/via/hw.c      | 2 +-
 trunk/drivers/video/via/share.h   | 1 +
 trunk/drivers/video/via/viamode.c | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index bbc545aa187b..ca87e26f0989 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32fab7bcc79ee0b97277627f456c94202858d851
+refs/heads/master: c5a4e6d725654045e548b1a1f33059a44a06910f
diff --git a/trunk/drivers/video/via/hw.c b/trunk/drivers/video/via/hw.c
index b8f01103f5c5..56ad185b7b22 100644
--- a/trunk/drivers/video/via/hw.c
+++ b/trunk/drivers/video/via/hw.c
@@ -2605,7 +2605,7 @@ int viafb_get_refresh(int hres, int vres, u32 long_refresh)
 
 	if (abs(best->refresh_rate - long_refresh) > 3) {
 		if (hres == 1200 && vres == 900)
-			return 50; /* OLPC DCON only supports 50 Hz */
+			return 49; /* OLPC DCON only supports 50 Hz */
 		else
 			return 60;
 	}
diff --git a/trunk/drivers/video/via/share.h b/trunk/drivers/video/via/share.h
index 4b7831f0d012..62bed2b12d6e 100644
--- a/trunk/drivers/video/via/share.h
+++ b/trunk/drivers/video/via/share.h
@@ -290,6 +290,7 @@
 #define HW_LAYOUT_LCD_EXTERNAL_LCD2 0x10
 
 /* Definition Refresh Rate */
+#define REFRESH_49      49
 #define REFRESH_50      50
 #define REFRESH_60      60
 #define REFRESH_75      75
diff --git a/trunk/drivers/video/via/viamode.c b/trunk/drivers/video/via/viamode.c
index 260d339b236c..ccb5eec63248 100644
--- a/trunk/drivers/video/via/viamode.c
+++ b/trunk/drivers/video/via/viamode.c
@@ -606,7 +606,7 @@ static struct crt_mode_table CRTM1200x720[] = {
 /* 1200x900 (DCON) */
 static struct crt_mode_table DCON1200x900[] = {
 	/* r_rate,               hsp,               vsp   */
-	{REFRESH_50, M1200X900_R60_HSP, M1200X900_R60_VSP,
+	{REFRESH_49, M1200X900_R60_HSP, M1200X900_R60_VSP,
 	/* The correct htotal is 1240, but this doesn't raster on VX855. */
 	/* Via suggested changing to a multiple of 16, hence 1264.       */
 	/*  HT,   HA,  HBS, HBE,  HSS, HSE,  VT,  VA, VBS, VBE, VSS, VSE */