V4L-DVB(7789a): cx18: fix symbol conflict with ivtv driver

LD      drivers/media/video/built-in.o
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
make[2]: ** [drivers/media/video/built-in.o] Erro 1
make[1]: ** [drivers/media/video] Erro 2
make: ** [drivers/media/] Erro 2

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/video/cx18/cx18-controls.c b/drivers/media/video/cx18/cx18-controls.c
index da299ae61cff8e2b3b0b41882509590fae5632ee..2bdac5ebbb0d884710769c0193ad8089aa58b0d2 100644 (file)
--- a/drivers/media/video/cx18/cx18-controls.c
+++ b/drivers/media/video/cx18/cx18-controls.c
@@ -184,12 +184,12 @@ static int cx18_setup_vbi_fmt(struct cx18 *cx, enum v4l2_mpeg_stream_vbi_fmt fmt
        if (cx->vbi.insert_mpeg == 0)
                return 0;
        /* Need sliced data for mpeg insertion */
-       if (get_service_set(cx->vbi.sliced_in) == 0) {
+       if (cx18_get_service_set(cx->vbi.sliced_in) == 0) {
                if (cx->is_60hz)
                        cx->vbi.sliced_in->service_set = V4L2_SLICED_CAPTION_525;
                else
                        cx->vbi.sliced_in->service_set = V4L2_SLICED_WSS_625;
-               expand_service_set(cx->vbi.sliced_in, cx->is_50hz);
+               cx18_expand_service_set(cx->vbi.sliced_in, cx->is_50hz);
        }
        return 0;
 }

diff --git a/drivers/media/video/cx18/cx18-ioctl.c b/drivers/media/video/cx18/cx18-ioctl.c
index 4a93af2e4bb6117da03ed07a0d2b3272cac75c39..dbdcb86ec5aac219659a6e5c784804a1b118f141 100644 (file)
--- a/drivers/media/video/cx18/cx18-ioctl.c
+++ b/drivers/media/video/cx18/cx18-ioctl.c
@@ -40,7 +40,7 @@
 #include <media/v4l2-chip-ident.h>
 #include <linux/i2c-id.h>
 
-u16 service2vbi(int type)
+u16 cx18_service2vbi(int type)
 {
        switch (type) {
        case V4L2_SLICED_TELETEXT_B:
@@ -88,7 +88,7 @@ static u16 select_service_from_set(int field, int line, u16 set, int is_pal)
        return 0;
 }
 
-void expand_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal)
+void cx18_expand_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal)
 {
        u16 set = fmt->service_set;
        int f, l;
@@ -114,7 +114,7 @@ static int check_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal)
        return set != 0;
 }
 
-u16 get_service_set(struct v4l2_sliced_vbi_format *fmt)
+u16 cx18_get_service_set(struct v4l2_sliced_vbi_format *fmt)
 {
        int f, l;
        u16 set = 0;
@@ -213,7 +213,7 @@ static int cx18_get_fmt(struct cx18 *cx, int streamtype, struct v4l2_format *fmt
                memset(vbifmt->service_lines, 0, sizeof(vbifmt->service_lines));
 
                cx18_av_cmd(cx, VIDIOC_G_FMT, fmt);
-               vbifmt->service_set = get_service_set(vbifmt);
+               vbifmt->service_set = cx18_get_service_set(vbifmt);
                break;
        }
        default:
@@ -285,9 +285,9 @@ static int cx18_try_or_set_fmt(struct cx18 *cx, int streamtype,
        memset(vbifmt->reserved, 0, sizeof(vbifmt->reserved));
 
        if (vbifmt->service_set)
-               expand_service_set(vbifmt, cx->is_50hz);
+               cx18_expand_service_set(vbifmt, cx->is_50hz);
        set = check_service_set(vbifmt, cx->is_50hz);
-       vbifmt->service_set = get_service_set(vbifmt);
+       vbifmt->service_set = cx18_get_service_set(vbifmt);
 
        if (!set_fmt)
                return 0;

diff --git a/drivers/media/video/cx18/cx18-ioctl.h b/drivers/media/video/cx18/cx18-ioctl.h
index 0ee152d837d602c0858a637c3284b9272c7dd3d2..9f4c7eb2897f91ebee7ffb9fad87faa18e2928f3 100644 (file)
--- a/drivers/media/video/cx18/cx18-ioctl.h
+++ b/drivers/media/video/cx18/cx18-ioctl.h
@@ -21,9 +21,9 @@
  *  02111-1307  USA
  */
 
-u16 service2vbi(int type);
-void expand_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal);
-u16 get_service_set(struct v4l2_sliced_vbi_format *fmt);
+u16 cx18_service2vbi(int type);
+void cx18_expand_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal);
+u16 cx18_get_service_set(struct v4l2_sliced_vbi_format *fmt);
 int cx18_v4l2_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
                    unsigned long arg);
 int cx18_v4l2_ioctls(struct cx18 *cx, struct file *filp, unsigned cmd,

diff --git a/drivers/media/video/cx18/cx18-vbi.c b/drivers/media/video/cx18/cx18-vbi.c
index 4bece9c02f7d404edf0a795a31de0ce6fb0f9ca1..22e76ee3f4475341a9246b66c6659ce8478aa586 100644 (file)
--- a/drivers/media/video/cx18/cx18-vbi.c
+++ b/drivers/media/video/cx18/cx18-vbi.c
@@ -58,7 +58,7 @@ static void copy_vbi_data(struct cx18 *cx, int lines, u32 pts_stamp)
                        linemask[0] |= (1 << l);
                else
                        linemask[1] |= (1 << (l - 32));
-               dst[sd + 12 + line * 43] = service2vbi(sdata->id);
+               dst[sd + 12 + line * 43] = cx18_service2vbi(sdata->id);
                memcpy(dst + sd + 12 + line * 43 + 1, sdata->data, 42);
                line++;
        }