Randy Dunlap wrote:
> Fromy: 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]>
> Cc: Scott Smedley <[email protected]>
> Cc: Marek  Lindner  <[email protected]>
> Cc: Simon  Wunderlich  <[email protected]>
> Cc:   Andrew Lunn <[email protected]>
> Cc:   [email protected]
> Cc:   Greg Kroah-Hartman <[email protected]
> ---

@Randy Dunlap: Thanks a lot for your patch.

The Patch was splitted and added to maint. Can somebody please add it to 
trunk.

Best regards,
        Sven

Attachment: signature.asc
Description: This is a digitally signed message part.

Reply via email to