diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-28 15:03:26 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-28 15:03:26 -0300 |
| commit | 54536bfb92cf321253a191a2a1d44c2cfde965c5 (patch) | |
| tree | 821b18bba93f705c9bc186767a689fef879ebc88 /linux/drivers/media/video/bt8xx/bttvp.h | |
| parent | 69afedcd6c1b81218dbc0d64a948ce1106199131 (diff) | |
| parent | 02c8751b2179fdc48f6c2150fc9f8ebbea626b21 (diff) | |
| download | mediapointer-dvb-s2-54536bfb92cf321253a191a2a1d44c2cfde965c5.tar.gz mediapointer-dvb-s2-54536bfb92cf321253a191a2a1d44c2cfde965c5.tar.bz2 | |
merge: http://linuxtv.org/hg/~anttip/v4l-dvb/
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/bt8xx/bttvp.h')
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttvp.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttvp.h b/linux/drivers/media/video/bt8xx/bttvp.h index b8ab81fb8..9fd8eeddf 100644 --- a/linux/drivers/media/video/bt8xx/bttvp.h +++ b/linux/drivers/media/video/bt8xx/bttvp.h @@ -263,9 +263,9 @@ int bttv_overlay_risc(struct bttv *btv, struct bttv_overlay *ov, /* ---------------------------------------------------------- */ /* bttv-vbi.c */ -int bttv_try_fmt_vbi(struct file *file, void *fh, struct v4l2_format *f); -int bttv_g_fmt_vbi(struct file *file, void *fh, struct v4l2_format *f); -int bttv_s_fmt_vbi(struct file *file, void *fh, struct v4l2_format *f); +int bttv_try_fmt_vbi_cap(struct file *file, void *fh, struct v4l2_format *f); +int bttv_g_fmt_vbi_cap(struct file *file, void *fh, struct v4l2_format *f); +int bttv_s_fmt_vbi_cap(struct file *file, void *fh, struct v4l2_format *f); extern struct videobuf_queue_ops bttv_vbi_qops; |