From 403a321b156d267bfcc486a76aea6d6530dd893c Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 19 Nov 2012 13:26:55 -0500
Subject: [PATCH] --- yaml --- r: 338134 b: refs/heads/master c:
 8db72ff52144d0ed32c15927c9fd86859453d6d1 h: refs/heads/master 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 0e63d61d6c9f..41307743babe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f4e1b7c830f813884679dc63bed3a708d0f5653e
+refs/heads/master: 8db72ff52144d0ed32c15927c9fd86859453d6d1
diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c
index 044374e3ac98..e0f745de7e7a 100644
--- a/trunk/drivers/staging/xgifb/XGI_main_26.c
+++ b/trunk/drivers/staging/xgifb/XGI_main_26.c
@@ -2103,7 +2103,7 @@ static int xgifb_probe(struct pci_dev *pdev,
 /*                PCI DEVICE HANDLING                */
 /*****************************************************/
 
-static void __devexit xgifb_remove(struct pci_dev *pdev)
+static void xgifb_remove(struct pci_dev *pdev)
 {
 	struct xgifb_video_info *xgifb_info = pci_get_drvdata(pdev);
 	struct fb_info *fb_info = xgifb_info->fb_info;