From 5e589e44ebab39d90974244c51500415cb1f677b Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Sat, 1 Nov 2008 18:20:39 +0000
Subject: [PATCH] --- yaml --- r: 118309 b: refs/heads/master c:
 f5ee051e748ae007b972c7e1b6a0588b8ac9ba40 h: refs/heads/master i:   118307:
 65287ff62e419c79719159f190b7cdbab7162984 v: v3

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

diff --git a/[refs] b/[refs]
index 1ecd6a9e5a88..9c632601faa6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28959742c14918f153c1de641bb12b4ea44315a1
+refs/heads/master: f5ee051e748ae007b972c7e1b6a0588b8ac9ba40
diff --git a/trunk/drivers/video/cirrusfb.c b/trunk/drivers/video/cirrusfb.c
index 048b139f0e50..8a8760230bc7 100644
--- a/trunk/drivers/video/cirrusfb.c
+++ b/trunk/drivers/video/cirrusfb.c
@@ -2049,7 +2049,7 @@ static void cirrusfb_pci_unmap(struct fb_info *info)
 #endif /* CONFIG_PCI */
 
 #ifdef CONFIG_ZORRO
-static void __devexit cirrusfb_zorro_unmap(struct fb_info *info)
+static void cirrusfb_zorro_unmap(struct fb_info *info)
 {
 	struct cirrusfb_info *cinfo = info->par;
 	struct zorro_dev *zdev = to_zorro_dev(info->device);