From dac7c838899a097e9c65586ac0ef3dc30a1e035e Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 19 Nov 2012 13:21:52 -0500
Subject: [PATCH] --- yaml --- r: 338107 b: refs/heads/master c:
 89f6883c70245323215b9e5786964621e4484382 h: refs/heads/master i:   338105:
 8d62246410ffc9e218b9dcab5e4a45a256cf06c0   338103:
 8c8c2666797bbf478052123da66775e23b5ceb8b v: v3

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

diff --git a/[refs] b/[refs]
index 34094984bc33..c55c13b5ffb9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3cf36aa9951828a6c164f3b3e12d4653af8ba69f
+refs/heads/master: 89f6883c70245323215b9e5786964621e4484382
diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c
index e9fe27debf7b..044374e3ac98 100644
--- a/trunk/drivers/staging/xgifb/XGI_main_26.c
+++ b/trunk/drivers/staging/xgifb/XGI_main_26.c
@@ -1695,7 +1695,7 @@ static int __init XGIfb_setup(char *options)
 	return 0;
 }
 
-static int __devinit xgifb_probe(struct pci_dev *pdev,
+static int xgifb_probe(struct pci_dev *pdev,
 		const struct pci_device_id *ent)
 {
 	u8 reg, reg1;