diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-05-01 11:22:13 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-05-01 11:22:13 +0200 |
| commit | 93c8d513a3fc829c1f340235756df7a3e13dedfa (patch) | |
| tree | 02e50519ebf26f10b1e9e404006b2c940ce3220b /linux/drivers/media/video/ivtv/ivtv-vbi.c | |
| parent | 6fa830d31ee7880f2ca969e559c57fc69b5ebfd1 (diff) | |
| download | mediapointer-dvb-s2-93c8d513a3fc829c1f340235756df7a3e13dedfa.tar.gz mediapointer-dvb-s2-93c8d513a3fc829c1f340235756df7a3e13dedfa.tar.bz2 | |
ivtv: prefix ivtv external functions with ivtv_
From: Hans Verkuil <hverkuil@xs4all.nl>
Fix conflict with cx18 driver.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-vbi.c')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-vbi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-vbi.c b/linux/drivers/media/video/ivtv/ivtv-vbi.c index c151bcf55..71798f0da 100644 --- a/linux/drivers/media/video/ivtv/ivtv-vbi.c +++ b/linux/drivers/media/video/ivtv/ivtv-vbi.c @@ -169,7 +169,8 @@ static void copy_vbi_data(struct ivtv *itv, int lines, u32 pts_stamp) linemask[0] |= (1 << l); else linemask[1] |= (1 << (l - 32)); - dst[sd + 12 + line * 43] = service2vbi(itv->vbi.sliced_data[i].id); + dst[sd + 12 + line * 43] = + ivtv_service2vbi(itv->vbi.sliced_data[i].id); memcpy(dst + sd + 12 + line * 43 + 1, itv->vbi.sliced_data[i].data, 42); line++; } |