From c06aa5c4e2de6b9e5e2299a23381e0d6d85915c2 Mon Sep 17 00:00:00 2001
From: Jon Schindler <jkschind@gmail.com>
Date: Wed, 30 Apr 2008 00:53:53 -0700
Subject: [PATCH] --- yaml --- r: 95209 b: refs/heads/master c:
 83e422b7649267067975cbb17a878b5f9dfd2de3 h: refs/heads/master i:   95207:
 3f8ef0408348f56b75b2e8dc72f9dacccb4bebb0 v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/char/ip2/ip2main.c | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d0f91b13e86e..9cade6ed8aea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11fb09bfabd699a94555b69d6e6c4fa6c3febde8
+refs/heads/master: 83e422b7649267067975cbb17a878b5f9dfd2de3
diff --git a/trunk/drivers/char/ip2/ip2main.c b/trunk/drivers/char/ip2/ip2main.c
index 0a61856c631f..319f804fc4d6 100644
--- a/trunk/drivers/char/ip2/ip2main.c
+++ b/trunk/drivers/char/ip2/ip2main.c
@@ -355,14 +355,15 @@ have_requested_irq( char irq )
 /* the driver initialisation function and returns what it returns.            */
 /******************************************************************************/
 #ifdef MODULE
-int
-init_module(void)
+static int __init
+ip2_init_module(void)
 {
 #ifdef IP2DEBUG_INIT
 	printk (KERN_DEBUG "Loading module ...\n" );
 #endif
     return 0;
 }
+module_init(ip2_init_module);
 #endif /* MODULE */
 
 /******************************************************************************/
@@ -381,8 +382,8 @@ init_module(void)
 /* driver should be returned since it may be unloaded from memory.            */
 /******************************************************************************/
 #ifdef MODULE
-void
-cleanup_module(void)
+void __exit
+ip2_cleanup_module(void)
 {
 	int err;
 	int i;
@@ -452,6 +453,7 @@ cleanup_module(void)
 	printk (KERN_DEBUG "IP2 Unloaded\n" );
 #endif
 }
+module_exit(ip2_cleanup_module);
 #endif /* MODULE */
 
 static const struct tty_operations ip2_ops = {