From 64476acde9f7edef10257fd8592a04fc7a570ab1 Mon Sep 17 00:00:00 2001
From: Peter Huewe <peterhuewe@gmx.de>
Date: Tue, 5 Feb 2013 22:32:30 +0100
Subject: [PATCH] --- yaml --- r: 354415 b: refs/heads/master c:
 86c6c948dabff1ff84213e5fb50684ad32895f25 h: refs/heads/master i:   354413:
 65e14f9537223815fdd1a69f8e5457d1cd60ea93   354411:
 08e4c5d4d8ab1536d3db4be3d6d918061b9014f3   354407:
 f6eb072b02b73cb0431a8ead0b70bfd1bf4fa72c   354399:
 101ae502d8629856558935745795e72b3ec0b1c9 v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/staging/xgifb/vb_struct.h |  2 +-
 trunk/drivers/staging/xgifb/vb_table.h  | 24 ++++++++++++------------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 2d89bd6cde8e..e1e919c4ed51 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87be0afafae74ab93303623fb600147968294702
+refs/heads/master: 86c6c948dabff1ff84213e5fb50684ad32895f25
diff --git a/trunk/drivers/staging/xgifb/vb_struct.h b/trunk/drivers/staging/xgifb/vb_struct.h
index 02f3bb5e09ce..ae0c18b320a4 100644
--- a/trunk/drivers/staging/xgifb/vb_struct.h
+++ b/trunk/drivers/staging/xgifb/vb_struct.h
@@ -157,7 +157,7 @@ struct vb_device_info {
 
 	void __iomem *FBAddr;
 
-	unsigned char const (*SR15)[8];
+	unsigned char const (*SR15)[3];
 	unsigned char const (*CR40)[3];
 
 	struct SiS_MCLKData const *MCLKData;
diff --git a/trunk/drivers/staging/xgifb/vb_table.h b/trunk/drivers/staging/xgifb/vb_table.h
index a1be75199e3d..b7abe25f3a4a 100644
--- a/trunk/drivers/staging/xgifb/vb_table.h
+++ b/trunk/drivers/staging/xgifb/vb_table.h
@@ -33,18 +33,18 @@ const struct XGI_ECLKDataStruct XGI340_ECLKData[] = {
 	{0x5c, 0x23, 0x01, 166}
 };
 
-static const unsigned char XG27_SR13[4][8] = {
-	{0x35, 0x45, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR13 */
-	{0x41, 0x51, 0x5c, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR14 */
-	{0x32, 0x32, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR18 */
-	{0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00}  /* SR1B */
-};
-
-static const unsigned char XGI340_SR13[4][8] = {
-	{0x35, 0x45, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR13 */
-	{0x41, 0x51, 0x5c, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR14 */
-	{0x31, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR18 */
-	{0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00}  /* SR1B */
+static const unsigned char XG27_SR13[4][3] = {
+	{0x35, 0x45, 0xb1}, /* SR13 */
+	{0x41, 0x51, 0x5c}, /* SR14 */
+	{0x32, 0x32, 0x42}, /* SR18 */
+	{0x03, 0x03, 0x03}  /* SR1B */
+};
+
+static const unsigned char XGI340_SR13[4][3] = {
+	{0x35, 0x45, 0xb1}, /* SR13 */
+	{0x41, 0x51, 0x5c}, /* SR14 */
+	{0x31, 0x42, 0x42}, /* SR18 */
+	{0x03, 0x03, 0x03}  /* SR1B */
 };
 
 static const unsigned char XGI340_cr41[24][3] = {