diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-05-01 09:22:13 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-14 02:54:08 -0300 |
| commit | feb5bce24ed4d90c0a5710a669072c778a2c5148 (patch) | |
| tree | 96ecf2f5844dfdd409baa0baa01dad673cb54f09 /drivers/media/video/ivtv/ivtv-controls.c | |
| parent | 755a18baad393836c88ce92c3b7198c70e2e3205 (diff) | |
| download | op-kernel-dev-feb5bce24ed4d90c0a5710a669072c778a2c5148.zip op-kernel-dev-feb5bce24ed4d90c0a5710a669072c778a2c5148.tar.gz | |
V4L/DVB (7852): ivtv: prefix ivtv external functions with ivtv_
Fix conflict with cx18 driver.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-controls.c')
| -rw-r--r-- | drivers/media/video/ivtv/ivtv-controls.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/ivtv/ivtv-controls.c b/drivers/media/video/ivtv/ivtv-controls.c index 8c02fa6..c7e449f 100644 --- a/drivers/media/video/ivtv/ivtv-controls.c +++ b/drivers/media/video/ivtv/ivtv-controls.c @@ -181,12 +181,12 @@ static int ivtv_setup_vbi_fmt(struct ivtv *itv, enum v4l2_mpeg_stream_vbi_fmt fm return 0; } /* Need sliced data for mpeg insertion */ - if (get_service_set(itv->vbi.sliced_in) == 0) { + if (ivtv_get_service_set(itv->vbi.sliced_in) == 0) { if (itv->is_60hz) itv->vbi.sliced_in->service_set = V4L2_SLICED_CAPTION_525; else itv->vbi.sliced_in->service_set = V4L2_SLICED_WSS_625; - expand_service_set(itv->vbi.sliced_in, itv->is_50hz); + ivtv_expand_service_set(itv->vbi.sliced_in, itv->is_50hz); } return 0; } |
