From 501b538a02b201ef2d6d1b2d0e5774b0041a692e Mon Sep 17 00:00:00 2001
From: "Justin P. Mattock" <justinmattock@gmail.com>
Date: Tue, 2 Oct 2012 21:17:11 -0700
Subject: [PATCH] --- yaml --- r: 337071 b: refs/heads/master c:
 558f758bd23447373841554d3394236420c2e0e0 h: refs/heads/master i:   337069:
 2c75fb6bfe6c71543d59d4e20a86728e19f85b2b   337067:
 db48fa5a196787fb1d8f7f45dd0c522522f3133c   337063:
 dc9dbd577fbeef596b8192dc8725d21f7ec48b93   337055:
 d7b7e355357c9137ecaca6f9e7261cacdc1ac3f5 v: v3

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

diff --git a/[refs] b/[refs]
index a67ef3b810ca..cfb881b5a17e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbf2f545d7adf9841d4b6ee7fbfa9b1706e369d4
+refs/heads/master: 558f758bd23447373841554d3394236420c2e0e0
diff --git a/trunk/drivers/staging/xgifb/TODO b/trunk/drivers/staging/xgifb/TODO
index 13d9bc25797d..392b29d8f134 100644
--- a/trunk/drivers/staging/xgifb/TODO
+++ b/trunk/drivers/staging/xgifb/TODO
@@ -1,4 +1,4 @@
-This drivers still need a lot of work. I can list all cleanups to do but it's
+This drivers still needs a lot of work. I can list all cleanups to do but it's
 going to be long. So, I'm writing "cleanups" and not the list.
 
 Arnaud
diff --git a/trunk/drivers/staging/xgifb/vb_setmode.c b/trunk/drivers/staging/xgifb/vb_setmode.c
index e95a1655a6ce..c8561a0b386d 100644
--- a/trunk/drivers/staging/xgifb/vb_setmode.c
+++ b/trunk/drivers/staging/xgifb/vb_setmode.c
@@ -2501,7 +2501,7 @@ static void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
 		} else {
 			temp = 0x017C;
 		}
-	} else { /* 3nd party chip */
+	} else { /* 3rd party chip */
 		temp = SetCRT2ToLCD;
 	}
 
@@ -4390,7 +4390,7 @@ static void XGI_SetLCDRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
 	xgifb_reg_and_or(pVBInfo->Part2Port, 0x17, 0xFB, 0x00);
 	xgifb_reg_and_or(pVBInfo->Part2Port, 0x18, 0xDF, 0x00);
 
-	/* Customized LCDB Des no add */
+	/* Customized LCDB Does not add */
 	tempbx = 5;
 	LCDBDesPtr = XGI_GetLcdPtr(tempbx, ModeNo, ModeIdIndex,
 				   RefreshRateTableIndex, pVBInfo);