Author: marek Date: 2010-07-22 17:32:01 +0200 (Thu, 22 Jul 2010) New Revision: 1741
Modified: trunk/batman-adv/main.c Log: batman-adv: don't use default init_module/cleanup_module function names
Fix two staging drivers to use module_init()/module_exit() instead of default init_module() and cleanup_module() function names so that there are no name conflicts when both are built-in.
drivers/staging/dt3155/built-in.o: In function `cleanup_module': (.text+0xc0): multiple definition of `cleanup_module' drivers/staging/batman-adv/built-in.o:(.text+0x330): first defined here drivers/staging/dt3155/built-in.o: In function `init_module': (.text+0xe60): multiple definition of `init_module' drivers/staging/batman-adv/built-in.o:(.text+0x400): first defined here
Signed-off-by: Randy Dunlap randy.dunlap@oracle.com [sven.eckelmann@gmx.de: Mark module init and exit functions as static] Signed-off-by: Sven Eckelmann sven.eckelmann@gmx.de
Modified: trunk/batman-adv/main.c =================================================================== --- trunk/batman-adv/main.c 2010-07-22 15:32:00 UTC (rev 1740) +++ trunk/batman-adv/main.c 2010-07-22 15:32:01 UTC (rev 1741) @@ -58,7 +58,7 @@
struct workqueue_struct *bat_event_workqueue;
-int init_module(void) +static int __init batman_init(void) { int retval;
@@ -127,7 +127,7 @@ return -ENOMEM; }
-void cleanup_module(void) +static void __exit batman_exit(void) { deactivate_module();
@@ -270,6 +270,9 @@ return *addr & 0x01; }
+module_init(batman_init); +module_exit(batman_exit); + MODULE_LICENSE("GPL");
MODULE_AUTHOR(DRIVER_AUTHOR);