From 1db5a400fc6ebada9f7aecf2fca86744e8723c5b Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 8 Sep 2010 01:49:45 -0700
Subject: [PATCH] --- yaml --- r: 219789 b: refs/heads/master c:
 51973d7fa0a2f2087e640200fda23f6bac71fae2 h: refs/heads/master i:   219787:
 ff32916c21273229411c1db8785eaa19d80f1e8f v: v3

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

diff --git a/[refs] b/[refs]
index 15a3ec9c44de..10bb301a6c3b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 675d6409ae5ac0816af5e672b7030e350408d563
+refs/heads/master: 51973d7fa0a2f2087e640200fda23f6bac71fae2
diff --git a/trunk/drivers/staging/xgifb/vb_setmode.c b/trunk/drivers/staging/xgifb/vb_setmode.c
index 720a592c9e63..7016fdd2509f 100644
--- a/trunk/drivers/staging/xgifb/vb_setmode.c
+++ b/trunk/drivers/staging/xgifb/vb_setmode.c
@@ -376,7 +376,7 @@ void InitTo330Pointer(unsigned char ChipType, struct vb_device_info *pVBInfo)
 unsigned char XGISetModeNew(struct xgi_hw_device_info *HwDeviceExtension,
 			unsigned short ModeNo)
 {
-	unsigned short ModeIdIndex = 0;
+	unsigned short ModeIdIndex;
 	/* unsigned char *pVBInfo->FBAddr = HwDeviceExtension->pjVideoMemoryAddress; */
 	struct vb_device_info VBINF;
 	struct vb_device_info *pVBInfo = &VBINF;
@@ -3512,9 +3512,6 @@ unsigned char XGI_GetLCDInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
 unsigned char XGI_SearchModeID(unsigned short ModeNo,
 		unsigned short *ModeIdIndex, struct vb_device_info *pVBInfo)
 {
-
-#ifdef LINUX /* chiawen for linux solution */
-
 	if (ModeNo <= 5)
 		ModeNo |= 1;
 	if (ModeNo <= 0x13) {
@@ -3541,8 +3538,6 @@ unsigned char XGI_SearchModeID(unsigned short ModeNo,
 		}
 	}
 
-#endif
-
 	return 1;
 }
 
@@ -3834,7 +3829,7 @@ unsigned char XGI_SetCRT2Group301(unsigned short ModeNo,
 		struct xgi_hw_device_info *HwDeviceExtension,
 		struct vb_device_info *pVBInfo)
 {
-	unsigned short tempbx, ModeIdIndex = 0, RefreshRateTableIndex;
+	unsigned short tempbx, ModeIdIndex, RefreshRateTableIndex;
 
 	tempbx = pVBInfo->VBInfo;
 	pVBInfo->SetFlag |= ProgrammingCRT2;