From 04c1257008c40bb5262df501a7d9adbc5603a6dc Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Wed, 23 Jul 2008 21:31:43 -0700
Subject: [PATCH] --- yaml --- r: 105563 b: refs/heads/master c:
 5798712d608f5ebad994487748a2ccf3cc613d78 h: refs/heads/master i:   105561:
 b146ba894edc8b9c73e1bb30015b68308d26b912   105559:
 889dca9519f54f1aec3862291551b26700dba493 v: v3

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

diff --git a/[refs] b/[refs]
index cc593c9afd57..7b8603dd8fb2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 104b198dd0b3b62a4fc4e9146f01f2abc718e926
+refs/heads/master: 5798712d608f5ebad994487748a2ccf3cc613d78
diff --git a/trunk/drivers/video/amifb.c b/trunk/drivers/video/amifb.c
index 0c549aa1cf87..b8e9a8682f2d 100644
--- a/trunk/drivers/video/amifb.c
+++ b/trunk/drivers/video/amifb.c
@@ -1136,7 +1136,6 @@ static int amifb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg
 	 * Interface to the low level console driver
 	 */
 
-int amifb_init(void);
 static void amifb_deinit(void);
 
 	/*
@@ -2248,7 +2247,7 @@ static inline void chipfree(void)
 	 * Initialisation
 	 */
 
-int __init amifb_init(void)
+static int __init amifb_init(void)
 {
 	int tag, i, err = 0;
 	u_long chipptr;
@@ -3793,16 +3792,14 @@ static void ami_rebuild_copper(void)
 	}
 }
 
-
-module_init(amifb_init);
-
-#ifdef MODULE
-MODULE_LICENSE("GPL");
-
-void cleanup_module(void)
+static void __exit amifb_exit(void)
 {
 	unregister_framebuffer(&fb_info);
 	amifb_deinit();
 	amifb_video_off();
 }
-#endif /* MODULE */
+
+module_init(amifb_init);
+module_exit(amifb_exit);
+
+MODULE_LICENSE("GPL");