From 6d67f85f26a751aeca1d35fbf655545281d6c3bc Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Sun, 27 Nov 2011 23:03:12 +0200
Subject: [PATCH] --- yaml --- r: 281135 b: refs/heads/master c:
 ed2e7203c37d7413f0b0e1b2a342164b744b31e9 h: refs/heads/master i:   281133:
 c2a86e64173f7b6eb0928fbe6c0e0c633ad41515   281131:
 de02317eceb0d616b1f8e8cfbd6b0cd137a4643e   281127:
 ec12816713424bc380e9915b0e6884fcf9de2c43   281119:
 3513602502db81ec214654476b95bfe327574eb6 v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/staging/xgifb/vb_setmode.c | 23 +++++++++++------------
 trunk/drivers/staging/xgifb/vb_setmode.h |  1 -
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 1f5f5edcde65..3141416a9639 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9913b6c0d72e74dfe2acdddd94f7e10e1b089884
+refs/heads/master: ed2e7203c37d7413f0b0e1b2a342164b744b31e9
diff --git a/trunk/drivers/staging/xgifb/vb_setmode.c b/trunk/drivers/staging/xgifb/vb_setmode.c
index bc035dbde3b3..3d5b343f7f13 100644
--- a/trunk/drivers/staging/xgifb/vb_setmode.c
+++ b/trunk/drivers/staging/xgifb/vb_setmode.c
@@ -3819,6 +3819,17 @@ static void XGI_XG27BLSignalVDD(unsigned short tempbh, unsigned short tempbl,
 	xgifb_reg_and_or(pVBInfo->P3d4, 0x48, ~tempbh, tempbl);
 }
 
+static unsigned short XGI_GetLVDSOEMTableIndex(struct vb_device_info *pVBInfo)
+{
+	unsigned short index;
+
+	index = xgifb_reg_get(pVBInfo->P3d4, 0x36);
+	if (index < sizeof(XGI21_LCDCapList)
+			/ sizeof(struct XGI21_LVDSCapStruct))
+		return index;
+	return 0;
+}
+
 /* --------------------------------------------------------------------- */
 /* Function : XGI_XG21SetPanelDelay */
 /* Input : */
@@ -6043,18 +6054,6 @@ static void XGI_DisableGatingCRT(struct xgi_hw_device_info *HwDeviceExtension,
 	xgifb_reg_and_or(pVBInfo->P3d4, 0x63, 0xBF, 0x00);
 }
 
-/* --------------------------------------------------------------------- */
-unsigned short XGI_GetLVDSOEMTableIndex(struct vb_device_info *pVBInfo)
-{
-	unsigned short index;
-
-	index = xgifb_reg_get(pVBInfo->P3d4, 0x36);
-	if (index < sizeof(XGI21_LCDCapList)
-			/ sizeof(struct XGI21_LVDSCapStruct))
-		return index;
-	return 0;
-}
-
 unsigned char XGI_XG21CheckLVDSMode(unsigned short ModeNo,
 		unsigned short ModeIdIndex, struct vb_device_info *pVBInfo)
 {
diff --git a/trunk/drivers/staging/xgifb/vb_setmode.h b/trunk/drivers/staging/xgifb/vb_setmode.h
index a91104469cf3..aa065a7300df 100644
--- a/trunk/drivers/staging/xgifb/vb_setmode.h
+++ b/trunk/drivers/staging/xgifb/vb_setmode.h
@@ -50,6 +50,5 @@ extern unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE,
 extern unsigned char XGI_XG21CheckLVDSMode(unsigned short ModeNo,
 					   unsigned short ModeIdIndex,
 					   struct vb_device_info *pVBInfo);
-extern unsigned short XGI_GetLVDSOEMTableIndex(struct vb_device_info *pVBInfo);
 
 #endif