From e2f355f0b3ccd150d97ea19b2d5f49733ab65d92 Mon Sep 17 00:00:00 2001
From: Ruslan Pisarev <ruslan@rpisarev.org.ua>
Date: Thu, 21 Jul 2011 11:59:11 +0300
Subject: [PATCH] --- yaml --- r: 267569 b: refs/heads/master c:
 032abf7bf9ee3a1ca89dd9dd88b1a8cee5e56e63 h: refs/heads/master i:   267567:
 d5d78d2db3961ddb3ad847f308ab36e261309026 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/staging/xgifb/XGI_main.h    | 1 -
 trunk/drivers/staging/xgifb/XGI_main_26.c | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 46a079902b8c..1c7be71e6377 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e684f4682d49e4815d2b6893a1862f183d755fb2
+refs/heads/master: 032abf7bf9ee3a1ca89dd9dd88b1a8cee5e56e63
diff --git a/trunk/drivers/staging/xgifb/XGI_main.h b/trunk/drivers/staging/xgifb/XGI_main.h
index 856c9f18c4ce..543ef2c363ee 100644
--- a/trunk/drivers/staging/xgifb/XGI_main.h
+++ b/trunk/drivers/staging/xgifb/XGI_main.h
@@ -41,7 +41,6 @@
 
 #define XGI_IOTYPE1 void __iomem
 #define XGI_IOTYPE2 __iomem
-#define XGIINITSTATIC static
 
 static DEFINE_PCI_DEVICE_TABLE(xgifb_pci_table) = {
 	{PCI_VENDOR_ID_XG, PCI_DEVICE_ID_XG_20, PCI_ANY_ID, PCI_ANY_ID,
diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c
index b6ee11fbca7e..df27dfed7560 100644
--- a/trunk/drivers/staging/xgifb/XGI_main_26.c
+++ b/trunk/drivers/staging/xgifb/XGI_main_26.c
@@ -1949,7 +1949,7 @@ static void XGIfb_get_VB_type(void)
 	}
 }
 
-XGIINITSTATIC int __init XGIfb_setup(char *options)
+static int __init XGIfb_setup(char *options)
 {
 	char *this_opt;
 
@@ -2543,7 +2543,7 @@ static struct pci_driver xgifb_driver = {
 	.remove = __devexit_p(xgifb_remove)
 };
 
-XGIINITSTATIC int __init xgifb_init(void)
+static int __init xgifb_init(void)
 {
 	char *option = NULL;