From dcd93771feab623ff7416c63fc5a5c70e50c4079 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 2 May 2008 00:37:39 -0300 Subject: backport commit aed6abd662c2903733bea7fcd3856c306e650680 From: Mauro Carvalho Chehab kernel-sync: Author: Mauro Carvalho Chehab 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 --- linux/drivers/media/video/cx18/cx18-audio.c | 1 - linux/drivers/media/video/cx18/cx18-controls.c | 4 ++-- linux/drivers/media/video/cx18/cx18-driver.h | 2 +- linux/drivers/media/video/cx18/cx18-dvb.c | 1 - linux/drivers/media/video/cx18/cx18-dvb.h | 1 - linux/drivers/media/video/cx18/cx18-gpio.c | 1 - linux/drivers/media/video/cx18/cx18-ioctl.c | 12 ++++++------ linux/drivers/media/video/cx18/cx18-ioctl.h | 6 +++--- linux/drivers/media/video/cx18/cx18-vbi.c | 2 +- 9 files changed, 13 insertions(+), 17 deletions(-) (limited to 'linux') diff --git a/linux/drivers/media/video/cx18/cx18-audio.c b/linux/drivers/media/video/cx18/cx18-audio.c index 68e8b32fd..1adc404d9 100644 --- a/linux/drivers/media/video/cx18/cx18-audio.c +++ b/linux/drivers/media/video/cx18/cx18-audio.c @@ -71,4 +71,3 @@ void cx18_audio_set_audio_clock_freq(struct cx18 *cx, u8 freq) return; cx18_call_i2c_clients(cx, VIDIOC_INT_AUDIO_CLOCK_FREQ, &freqs[freq]); } - diff --git a/linux/drivers/media/video/cx18/cx18-controls.c b/linux/drivers/media/video/cx18/cx18-controls.c index da299ae61..2bdac5ebb 100644 --- a/linux/drivers/media/video/cx18/cx18-controls.c +++ b/linux/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/linux/drivers/media/video/cx18/cx18-driver.h b/linux/drivers/media/video/cx18/cx18-driver.h index 48dffe228..f76e66c0a 100644 --- a/linux/drivers/media/video/cx18/cx18-driver.h +++ b/linux/drivers/media/video/cx18/cx18-driver.h @@ -51,7 +51,7 @@ #include #include "cx18-mailbox.h" #include "cx18-av-core.h" -#include +#include "cx23418.h" /* DVB */ #include "demux.h" diff --git a/linux/drivers/media/video/cx18/cx18-dvb.c b/linux/drivers/media/video/cx18/cx18-dvb.c index 48b533ee1..65efe69d9 100644 --- a/linux/drivers/media/video/cx18/cx18-dvb.c +++ b/linux/drivers/media/video/cx18/cx18-dvb.c @@ -286,4 +286,3 @@ static int dvb_register(struct cx18_stream *stream) return ret; } - diff --git a/linux/drivers/media/video/cx18/cx18-dvb.h b/linux/drivers/media/video/cx18/cx18-dvb.h index e186db622..d6a6ccda7 100644 --- a/linux/drivers/media/video/cx18/cx18-dvb.h +++ b/linux/drivers/media/video/cx18/cx18-dvb.h @@ -23,4 +23,3 @@ int cx18_dvb_register(struct cx18_stream *stream); void cx18_dvb_unregister(struct cx18_stream *stream); - diff --git a/linux/drivers/media/video/cx18/cx18-gpio.c b/linux/drivers/media/video/cx18/cx18-gpio.c index 1fda44513..61887aaca 100644 --- a/linux/drivers/media/video/cx18/cx18-gpio.c +++ b/linux/drivers/media/video/cx18/cx18-gpio.c @@ -86,4 +86,3 @@ int cx18_reset_tuner_gpio(void *dev, int cmd, int value) #endif return 0; } - diff --git a/linux/drivers/media/video/cx18/cx18-ioctl.c b/linux/drivers/media/video/cx18/cx18-ioctl.c index 7dc9e34e2..fab35cc83 100644 --- a/linux/drivers/media/video/cx18/cx18-ioctl.c +++ b/linux/drivers/media/video/cx18/cx18-ioctl.c @@ -40,7 +40,7 @@ #include #include -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: @@ -291,9 +291,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/linux/drivers/media/video/cx18/cx18-ioctl.h b/linux/drivers/media/video/cx18/cx18-ioctl.h index 0ee152d83..9f4c7eb28 100644 --- a/linux/drivers/media/video/cx18/cx18-ioctl.h +++ b/linux/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/linux/drivers/media/video/cx18/cx18-vbi.c b/linux/drivers/media/video/cx18/cx18-vbi.c index 4bece9c02..22e76ee3f 100644 --- a/linux/drivers/media/video/cx18/cx18-vbi.c +++ b/linux/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++; } -- cgit v1.2.3