From: Randy Dunlap Date: Tue, 20 Jul 2010 22:25:21 +0000 (+0200) Subject: Staging: batman-adv: don't use default init_module/cleanup_module function names X-Git-Tag: v2.6.36-rc1~520^2~1^2~114 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0cad1e7b81bc9601866586af6dcd6fde8c908ef;p=pandora-kernel.git 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 [sven.eckelmann@gmx.de: Mark module init and exit functions as static] Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman --- Reading git-diff-tree failed