From 0cc7741bf03baa71405b06cee6872d5dd023ecb0 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Wed, 21 Jul 2010 00:25:21 +0200
Subject: [PATCH] --- yaml --- r: 205952 b: refs/heads/master c:
 c0cad1e7b81bc9601866586af6dcd6fde8c908ef h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/staging/batman-adv/main.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 28c7d4caf446..7051858a8670 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1a38cad4c71bc08403b204fbe0ba98b4447f8bf
+refs/heads/master: c0cad1e7b81bc9601866586af6dcd6fde8c908ef
diff --git a/trunk/drivers/staging/batman-adv/main.c b/trunk/drivers/staging/batman-adv/main.c
index a4d238b76b5a..2686019fe4e1 100644
--- a/trunk/drivers/staging/batman-adv/main.c
+++ b/trunk/drivers/staging/batman-adv/main.c
@@ -59,7 +59,7 @@ static struct packet_type batman_adv_packet_type __read_mostly = {
 
 struct workqueue_struct *bat_event_workqueue;
 
-int init_module(void)
+static int __init batman_init(void)
 {
 	int retval;
 
@@ -131,7 +131,7 @@ int init_module(void)
 	return -ENOMEM;
 }
 
-void cleanup_module(void)
+static void __exit batman_exit(void)
 {
 	deactivate_module();
 
@@ -273,6 +273,9 @@ int is_mcast(uint8_t *addr)
 	return *addr & 0x01;
 }
 
+module_init(batman_init);
+module_exit(batman_exit);
+
 MODULE_LICENSE("GPL");
 
 MODULE_AUTHOR(DRIVER_AUTHOR);