[ivtv-devel] [PATCH] Eliminate cx18 ivtv vbi symbol collisions ([PULL] http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-cx18)

Andy Walls awalls at radix.net
Wed Apr 30 01:04:24 CEST 2008


Mauro Carvalho Chehab wrote:
> On Mon, 28 Apr 2008 22:42:40 +0200
> Hans Verkuil <hverkuil at xs4all.nl> wrote:
> 
> > Hi Mauro,
> > 
> > Please pull from http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-cx18 for 
> > the following:
> > 
> > - cx18: new driver for the Conexant CX23418 MPEG encoder chip
> > - cx18: add new cx18-ctl control utility
> > 
> 
> Also: there are duplicated symbols on ivtv and cx18:
> 
> drivers/media/video/cx18/built-in.o: In function `get_service_set':
> /home/v4l/tokernel/git/drivers/media/video/cx18/cx18-ioctl.c:118: multiple definition of `get_service_set'
> drivers/media/video/ivtv/built-in.o:/home/v4l/tokernel/git/drivers/media/video/ivtv/ivtv-ioctl.c:119: first defined here
> drivers/media/video/cx18/built-in.o: In function `expand_service_set':
> /home/v4l/tokernel/git/drivers/media/video/cx18/cx18-ioctl.c:92: multiple definition of `expand_service_set'
> drivers/media/video/ivtv/built-in.o:/home/v4l/tokernel/git/drivers/media/video/ivtv/ivtv-ioctl.c:92: first defined here
> drivers/media/video/cx18/built-in.o: In function `service2vbi':
> /home/v4l/tokernel/git/drivers/media/video/cx18/cx18-ioctl.c:44: multiple definition of `service2vbi'
> drivers/media/video/ivtv/built-in.o:/home/v4l/tokernel/git/drivers/media/video/ivtv/ivtv-ioctl.c:42: first defined here
> 
> 
> Cheers,
> Mauro

Hans,

The attached patch should get rid of the symbol collision on the cx18
side of things.

I assumed the symbols were cx18 module internal and not directly used
from outside the cx18 directory.  Given that the calls were spread
across source files, making them file scope by declaring them static was
not an option. Please review.

Signed-off-by: Andy Walls <awalls at radix.net>


Regards,
Andy
-------------- next part --------------
A non-text attachment was scrubbed...
Name: cx18-ivtv-vbi-collision.patch
Type: text/x-patch
Size: 3748 bytes
Desc: not available
Url : http://ivtvdriver.org/pipermail/ivtv-devel/attachments/20080429/dd405a53/attachment.bin 


More information about the ivtv-devel mailing list