diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-05-01 12:22:13 (GMT) |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-14 05:54:08 (GMT) |
| commit | feb5bce24ed4d90c0a5710a669072c778a2c5148 (patch) | |
| tree | 96ecf2f5844dfdd409baa0baa01dad673cb54f09 /drivers/media/video/ivtv/ivtv-ioctl.h | |
| parent | 755a18baad393836c88ce92c3b7198c70e2e3205 (diff) | |
| download | linux-fsl-qoriq-feb5bce24ed4d90c0a5710a669072c778a2c5148.tar.xz | |
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-ioctl.h')
| -rw-r--r-- | drivers/media/video/ivtv/ivtv-ioctl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.h b/drivers/media/video/ivtv/ivtv-ioctl.h index a03351b..4e67f0e 100644 --- a/drivers/media/video/ivtv/ivtv-ioctl.h +++ b/drivers/media/video/ivtv/ivtv-ioctl.h @@ -21,9 +21,9 @@ #ifndef IVTV_IOCTL_H #define IVTV_IOCTL_H -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 ivtv_service2vbi(int type); +void ivtv_expand_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal); +u16 ivtv_get_service_set(struct v4l2_sliced_vbi_format *fmt); int ivtv_v4l2_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void *arg); |