---

yaml --- r: 267569 b: refs/heads/master c: 032abf7 h: refs/heads/master i: 267567: d5d78d2 v: v3
git-mirror · Aug 23, 2011 · e2f355f · e2f355f
1 parent cfcffde
commit e2f355f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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;