From: Randy Dunlap <[email protected]> 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 <[email protected]> [[email protected]: Mark module init and exit functions as static] Signed-off-by: Sven Eckelmann <[email protected]> --- I send this patch again because I had to change the function heads again. batman-adv/main.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/batman-adv/main.c b/batman-adv/main.c index 1b3acd1..b51917d 100644 --- a/batman-adv/main.c +++ b/batman-adv/main.c @@ -58,7 +58,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; @@ -127,7 +127,7 @@ end: return -ENOMEM; } -void cleanup_module(void) +static void __init batman_exit(void) { deactivate_module(); @@ -270,6 +270,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); -- 1.7.1
