[media] Don't export format_by_forcc on two different drivers
authorMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 2 Dec 2010 03:57:03 +0000 (01:57 -0200)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 2 Dec 2010 03:59:10 +0000 (01:59 -0200)
commita757ee2216211278680dd8ac869aabe7b4a9970d
tree1b1e2f44ba7937252b7d8b7cbad292cd5c2b1261
parent9a1f8b34aa539000da17a06235e4bec254d0bfb5
[media] Don't export format_by_forcc on two different drivers

Drivers should append their name on exported symbols, to avoid
conflicts with allyesconfig:

drivers/staging/built-in.o: In function `format_by_fourcc':
/home/v4l/work_trees/linus/drivers/staging/cx25821/cx25821-video.c:96: multiple definition of `format_by_fourcc'
drivers/media/built-in.o:/home/v4l/work_trees/linus/drivers/media/common/saa7146_video.c:88: first defined here

Let's rename both occurences with a small shellscript:

for i in drivers/staging/cx25821/*.[ch]; do sed s,format_by_fourcc,cx25821_format_by_fourcc,g <$i >a && mv a $i; done
for i in drivers/media/common/saa7146*.[ch]; do sed s,format_by_fourcc,saa7146_format_by_fourcc,g <$i >a && mv a $i; done
for i in include/media/saa7146*.[ch]; do sed s,format_by_fourcc,saa7146_format_by_fourcc,g <$i >a && mv a $i; done

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/common/saa7146_hlp.c
drivers/media/common/saa7146_video.c
drivers/staging/cx25821/cx25821-video.c
drivers/staging/cx25821/cx25821-video.h
include/media/saa7146.h