diff --git a/[refs] b/[refs]
index 338f1fe2a5d9..b5b0fad9932e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd00b1154d3c7d711e83c3c17b831aafe6377532
+refs/heads/master: 75ec72f8c53b9f981e68704432a2e425a01f79b7
diff --git a/trunk/drivers/video/via/hw.c b/trunk/drivers/video/via/hw.c
index 5b9c096654be..3308f471b68a 100644
--- a/trunk/drivers/video/via/hw.c
+++ b/trunk/drivers/video/via/hw.c
@@ -20,6 +20,7 @@
  */
 
 #include <linux/via-core.h>
+#include <asm/olpc.h>
 #include "global.h"
 
 static struct pll_config cle266_pll_config[] = {
@@ -911,6 +912,10 @@ void viafb_set_iga_path(void)
 				viaparinfo->chip_info->
 				lvds_chip_info2.output_interface);
 	}
+
+	/* looks like the OLPC has its display wired to DVP1 and LVDS2 */
+	if (machine_is_olpc())
+		viaparinfo->shared->iga2_devices = VIA_DVP1 | VIA_LVDS2;
 }
 
 static void set_color_register(u8 index, u8 red, u8 green, u8 blue)
@@ -2620,8 +2625,12 @@ int viafb_get_refresh(int hres, int vres, u32 long_refresh)
 			best = &vmode->crtc[i];
 	}
 
-	if (abs(best->refresh_rate - long_refresh) > 3)
-		return 60;
+	if (abs(best->refresh_rate - long_refresh) > 3) {
+		if (hres == 1200 && vres == 900)
+			return 49; /* OLPC DCON only supports 50 Hz */
+		else
+			return 60;
+	}
 
 	return best->refresh_rate;
 }
diff --git a/trunk/drivers/video/via/share.h b/trunk/drivers/video/via/share.h
index beb59bcdf49f..8b93e2f6fea2 100644
--- a/trunk/drivers/video/via/share.h
+++ b/trunk/drivers/video/via/share.h
@@ -282,6 +282,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 036ad3ab6b9d..f84c9b03b6bb 100644
--- a/trunk/drivers/video/via/viamode.c
+++ b/trunk/drivers/video/via/viamode.c
@@ -587,7 +587,7 @@ static struct crt_mode_table CRTM1200x720[] = {
 /* 1200x900 (DCON) */
 static struct crt_mode_table DCON1200x900[] = {
 	/* r_rate,               hsp,               vsp   */
-	{REFRESH_60, 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 */