From 6c844206e32b74a32805462414e746822cb86ce2 Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Sun, 27 Nov 2011 23:03:15 +0200
Subject: [PATCH] --- yaml --- r: 281138 b: refs/heads/master c:
 eb9aef1de11396fc1d0520c403ddc58e8b488586 h: refs/heads/master v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/staging/xgifb/vb_setmode.c | 24 +-----------------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index 3be33f76c15b..054da7128161 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ffc7e9feea5f825fce99c7cb7ae18ae46172e01
+refs/heads/master: eb9aef1de11396fc1d0520c403ddc58e8b488586
diff --git a/trunk/drivers/staging/xgifb/vb_setmode.c b/trunk/drivers/staging/xgifb/vb_setmode.c
index fddf331e4db6..9f11daf84081 100644
--- a/trunk/drivers/staging/xgifb/vb_setmode.c
+++ b/trunk/drivers/staging/xgifb/vb_setmode.c
@@ -236,28 +236,6 @@ static void XGI_SetSeqRegs(unsigned short ModeNo,
 	}
 }
 
-static void XGI_SetMiscRegs(unsigned short StandTableIndex,
-			    struct vb_device_info *pVBInfo)
-{
-	unsigned char Miscdata;
-
-	/* Get Misc from file */
-	Miscdata = pVBInfo->StandTable[StandTableIndex].MISC;
-	/*
-	if (pVBInfo->VBType & (VB_XGI301B |
-			       VB_XGI302B |
-			       VB_XGI301LV |
-			       VB_XGI302LV |
-			       VB_XGI301C)) {
-		if (pVBInfo->VBInfo & SetCRT2ToLCDA) {
-			Miscdata |= 0x0C;
-		}
-	}
-	*/
-
-	outb(Miscdata, pVBInfo->P3c2); /* Set Misc(3c2) */
-}
-
 static void XGI_SetCRTCRegs(struct xgi_hw_device_info *HwDeviceExtension,
 			    unsigned short StandTableIndex,
 			    struct vb_device_info *pVBInfo)
@@ -7663,7 +7641,7 @@ static void XGI_SetCRT1Group(struct xgi_hw_device_info *HwDeviceExtension,
 	/* XGI_SetBIOSData(ModeNo, ModeIdIndex); */
 	/* XGI_ClearBankRegs(ModeNo, ModeIdIndex); */
 	XGI_SetSeqRegs(ModeNo, StandTableIndex, ModeIdIndex, pVBInfo);
-	XGI_SetMiscRegs(StandTableIndex, pVBInfo);
+	outb(pVBInfo->StandTable[StandTableIndex].MISC, pVBInfo->P3c2);
 	XGI_SetCRTCRegs(HwDeviceExtension, StandTableIndex, pVBInfo);
 	XGI_SetATTRegs(ModeNo, StandTableIndex, ModeIdIndex, pVBInfo);
 	XGI_SetGRCRegs(StandTableIndex, pVBInfo);