From 8732e5a4ca74d70e288464764ac538baaea96d13 Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Wed, 15 Oct 2008 22:03:49 -0700
Subject: [PATCH] --- yaml --- r: 114866 b: refs/heads/master c:
 1a3b09dc9aeaaab25ff736c2443df423a8fb655e h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/video/fbmon.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index afc96e0b9ae0..1a15af5df9fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c1fd1c0764e1a399ccb12e2d261603fe96d2e420
+refs/heads/master: 1a3b09dc9aeaaab25ff736c2443df423a8fb655e
diff --git a/trunk/drivers/video/fbmon.c b/trunk/drivers/video/fbmon.c
index 6a0aa180c266..5c1a2c01778f 100644
--- a/trunk/drivers/video/fbmon.c
+++ b/trunk/drivers/video/fbmon.c
@@ -564,7 +564,13 @@ static void get_detailed_timing(unsigned char *block,
 		mode->sync |= FB_SYNC_VERT_HIGH_ACT;
 	mode->refresh = PIXEL_CLOCK/((H_ACTIVE + H_BLANKING) *
 				     (V_ACTIVE + V_BLANKING));
-	mode->vmode = 0;
+	if (INTERLACED) {
+		mode->yres *= 2;
+		mode->upper_margin *= 2;
+		mode->lower_margin *= 2;
+		mode->vsync_len *= 2;
+		mode->vmode |= FB_VMODE_INTERLACED;
+	}
 	mode->flag = FB_MODE_IS_DETAILED;
 
 	DPRINTK("      %d MHz ",  PIXEL_CLOCK/1000000);