From 7f7c28f8643625597acb35891d31e546fc367429 Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Sat, 9 Feb 2013 00:03:48 +0200
Subject: [PATCH] --- yaml --- r: 354475 b: refs/heads/master c:
 5305d746054d1c73e7e9263b25189dedefb2dc01 h: refs/heads/master i:   354473:
 f4356c04482e1b49ec73c412b5714df8b5179d93   354471:
 34342f2321a23b82424c0b9540391b6ec8f3bc14 v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/staging/xgifb/vb_setmode.c | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 584fb5be85cc..4984c484ae4b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22006839a265c69fa56fbe9fadbd5c5e8c9d9736
+refs/heads/master: 5305d746054d1c73e7e9263b25189dedefb2dc01
diff --git a/trunk/drivers/staging/xgifb/vb_setmode.c b/trunk/drivers/staging/xgifb/vb_setmode.c
index 2f9046439b0d..3d5c4244c809 100644
--- a/trunk/drivers/staging/xgifb/vb_setmode.c
+++ b/trunk/drivers/staging/xgifb/vb_setmode.c
@@ -4863,16 +4863,6 @@ static void XGI_SetDelayComp(struct vb_device_info *pVBInfo)
 			}
 			xgifb_reg_set(pVBInfo->Part1Port, 0x2D, tempah);
 		}
-	} else if (pVBInfo->IF_DEF_LVDS == 1) {
-		tempbl = 0;
-		tempbh = 0;
-		if (pVBInfo->VBInfo & SetCRT2ToLCD) {
-			tempah = XGI301LCDDelay;
-			tempah &= 0x0f;
-			tempah = tempah << 4;
-			xgifb_reg_and_or(pVBInfo->Part1Port, 0x2D, 0x0f,
-					tempah);
-		}
 	}
 }