From 7ff872145b794a0a99c23bdbb1ceef64e97326d5 Mon Sep 17 00:00:00 2001
From: Prarit Bhargava <prarit@redhat.com>
Date: Tue, 8 May 2007 00:37:10 -0700
Subject: [PATCH] --- yaml --- r: 54870 b: refs/heads/master c:
 825d0a97f3b9031235b1ee77b1e22fec15c758ba h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/video/riva/fbdev.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 248895bfca94..95b7937da198 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 125e1137cd2d93377028f521801d916729485733
+refs/heads/master: 825d0a97f3b9031235b1ee77b1e22fec15c758ba
diff --git a/trunk/drivers/video/riva/fbdev.c b/trunk/drivers/video/riva/fbdev.c
index d7ece8d17a2c..a37189a227ac 100644
--- a/trunk/drivers/video/riva/fbdev.c
+++ b/trunk/drivers/video/riva/fbdev.c
@@ -2104,7 +2104,7 @@ static int __devinit rivafb_probe(struct pci_dev *pd,
 	return ret;
 }
 
-static void __exit rivafb_remove(struct pci_dev *pd)
+static void __devexit rivafb_remove(struct pci_dev *pd)
 {
 	struct fb_info *info = pci_get_drvdata(pd);
 	struct riva_par *par = info->par;
@@ -2185,7 +2185,7 @@ static struct pci_driver rivafb_driver = {
 	.name		= "rivafb",
 	.id_table	= rivafb_pci_tbl,
 	.probe		= rivafb_probe,
-	.remove		= __exit_p(rivafb_remove),
+	.remove		= __devexit_p(rivafb_remove),
 };