aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-04-29 20:38:51 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-29 17:41:42 -0400
commitaed6abd662c2903733bea7fcd3856c306e650680 (patch)
treefee80dfdbf3a19bdc79c37efec4ec69989ff5e32 /drivers/media
parenta07c8779fd212dcbad886a2824ef5f8b42cd5a06 (diff)
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>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/cx18/cx18-controls.c4
-rw-r--r--drivers/media/video/cx18/cx18-ioctl.c12
-rw-r--r--drivers/media/video/cx18/cx18-ioctl.h6
-rw-r--r--drivers/media/video/cx18/cx18-vbi.c2
4 files changed, 12 insertions, 12 deletions
diff --git a/drivers/media/video/cx18/cx18-controls.c b/drivers/media/video/cx18/cx18-controls.c
index da299ae61cff..2bdac5ebbb0d 100644
--- 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
184 if (cx->vbi.insert_mpeg == 0) 184 if (cx->vbi.insert_mpeg == 0)
185 return 0; 185 return 0;
186 /* Need sliced data for mpeg insertion */ 186 /* Need sliced data for mpeg insertion */
187 if (get_service_set(cx->vbi.sliced_in) == 0) { 187 if (cx18_get_service_set(cx->vbi.sliced_in) == 0) {
188 if (cx->is_60hz) 188 if (cx->is_60hz)
189 cx->vbi.sliced_in->service_set = V4L2_SLICED_CAPTION_525; 189 cx->vbi.sliced_in->service_set = V4L2_SLICED_CAPTION_525;
190 else 190 else
191 cx->vbi.sliced_in->service_set = V4L2_SLICED_WSS_625; 191 cx->vbi.sliced_in->service_set = V4L2_SLICED_WSS_625;
192 expand_service_set(cx->vbi.sliced_in, cx->is_50hz); 192 cx18_expand_service_set(cx->vbi.sliced_in, cx->is_50hz);
193 } 193 }
194 return 0; 194 return 0;
195} 195}
diff --git a/drivers/media/video/cx18/cx18-ioctl.c b/drivers/media/video/cx18/cx18-ioctl.c
index 4a93af2e4bb6..dbdcb86ec5aa 100644
--- a/drivers/media/video/cx18/cx18-ioctl.c
+++ b/drivers/media/video/cx18/cx18-ioctl.c
@@ -40,7 +40,7 @@
40#include <media/v4l2-chip-ident.h> 40#include <media/v4l2-chip-ident.h>
41#include <linux/i2c-id.h> 41#include <linux/i2c-id.h>
42 42
43u16 service2vbi(int type) 43u16 cx18_service2vbi(int type)
44{ 44{
45 switch (type) { 45 switch (type) {
46 case V4L2_SLICED_TELETEXT_B: 46 case V4L2_SLICED_TELETEXT_B:
@@ -88,7 +88,7 @@ static u16 select_service_from_set(int field, int line, u16 set, int is_pal)
88 return 0; 88 return 0;
89} 89}
90 90
91void expand_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal) 91void cx18_expand_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal)
92{ 92{
93 u16 set = fmt->service_set; 93 u16 set = fmt->service_set;
94 int f, l; 94 int f, l;
@@ -114,7 +114,7 @@ static int check_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal)
114 return set != 0; 114 return set != 0;
115} 115}
116 116
117u16 get_service_set(struct v4l2_sliced_vbi_format *fmt) 117u16 cx18_get_service_set(struct v4l2_sliced_vbi_format *fmt)
118{ 118{
119 int f, l; 119 int f, l;
120 u16 set = 0; 120 u16 set = 0;
@@ -213,7 +213,7 @@ static int cx18_get_fmt(struct cx18 *cx, int streamtype, struct v4l2_format *fmt
213 memset(vbifmt->service_lines, 0, sizeof(vbifmt->service_lines)); 213 memset(vbifmt->service_lines, 0, sizeof(vbifmt->service_lines));
214 214
215 cx18_av_cmd(cx, VIDIOC_G_FMT, fmt); 215 cx18_av_cmd(cx, VIDIOC_G_FMT, fmt);
216 vbifmt->service_set = get_service_set(vbifmt); 216 vbifmt->service_set = cx18_get_service_set(vbifmt);
217 break; 217 break;
218 } 218 }
219 default: 219 default:
@@ -285,9 +285,9 @@ static int cx18_try_or_set_fmt(struct cx18 *cx, int streamtype,
285 memset(vbifmt->reserved, 0, sizeof(vbifmt->reserved)); 285 memset(vbifmt->reserved, 0, sizeof(vbifmt->reserved));
286 286
287 if (vbifmt->service_set) 287 if (vbifmt->service_set)
288 expand_service_set(vbifmt, cx->is_50hz); 288 cx18_expand_service_set(vbifmt, cx->is_50hz);
289 set = check_service_set(vbifmt, cx->is_50hz); 289 set = check_service_set(vbifmt, cx->is_50hz);
290 vbifmt->service_set = get_service_set(vbifmt); 290 vbifmt->service_set = cx18_get_service_set(vbifmt);
291 291
292 if (!set_fmt) 292 if (!set_fmt)
293 return 0; 293 return 0;
diff --git a/drivers/media/video/cx18/cx18-ioctl.h b/drivers/media/video/cx18/cx18-ioctl.h
index 0ee152d837d6..9f4c7eb2897f 100644
--- a/drivers/media/video/cx18/cx18-ioctl.h
+++ b/drivers/media/video/cx18/cx18-ioctl.h
@@ -21,9 +21,9 @@
21 * 02111-1307 USA 21 * 02111-1307 USA
22 */ 22 */
23 23
24u16 service2vbi(int type); 24u16 cx18_service2vbi(int type);
25void expand_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal); 25void cx18_expand_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal);
26u16 get_service_set(struct v4l2_sliced_vbi_format *fmt); 26u16 cx18_get_service_set(struct v4l2_sliced_vbi_format *fmt);
27int cx18_v4l2_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, 27int cx18_v4l2_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
28 unsigned long arg); 28 unsigned long arg);
29int cx18_v4l2_ioctls(struct cx18 *cx, struct file *filp, unsigned cmd, 29int 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 4bece9c02f7d..22e76ee3f447 100644
--- 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)
58 linemask[0] |= (1 << l); 58 linemask[0] |= (1 << l);
59 else 59 else
60 linemask[1] |= (1 << (l - 32)); 60 linemask[1] |= (1 << (l - 32));
61 dst[sd + 12 + line * 43] = service2vbi(sdata->id); 61 dst[sd + 12 + line * 43] = cx18_service2vbi(sdata->id);
62 memcpy(dst + sd + 12 + line * 43 + 1, sdata->data, 42); 62 memcpy(dst + sd + 12 + line * 43 + 1, sdata->data, 42);
63 line++; 63 line++;
64 } 64 }