]> bbs.cooldavid.org Git - net-next-2.6.git/commit
Staging: batman-adv: don't use default init_module/cleanup_module function names
authorRandy Dunlap <randy.dunlap@oracle.com>
Tue, 20 Jul 2010 22:25:21 +0000 (00:25 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 22 Jul 2010 21:29:33 +0000 (14:29 -0700)
commitc0cad1e7b81bc9601866586af6dcd6fde8c908ef
tree46602406c29fb43a365496c87234c1e2fb4f5b45
parenta1a38cad4c71bc08403b204fbe0ba98b4447f8bf
Staging: 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/batman-adv/main.c