diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-26 12:00:49 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-26 12:00:49 -0300 |
| commit | cf2c310a0889cdeb0bc711e69833b77007717bcd (patch) | |
| tree | 58fd2d9677b13ab45ee7eecf8149effbd90f9215 /linux/include | |
| parent | b0674752e665f2b9f9b201c20341bdb326e881bb (diff) | |
| parent | 3a06e7be6db2c2b35e97a92b23c9191888a07042 (diff) | |
| download | mediapointer-dvb-s2-cf2c310a0889cdeb0bc711e69833b77007717bcd.tar.gz mediapointer-dvb-s2-cf2c310a0889cdeb0bc711e69833b77007717bcd.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/media/v4l2-dev.h | 1 | ||||
| -rw-r--r-- | linux/include/media/videobuf-core.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/linux/include/media/v4l2-dev.h b/linux/include/media/v4l2-dev.h index 42ae06c32..b542b7867 100644 --- a/linux/include/media/v4l2-dev.h +++ b/linux/include/media/v4l2-dev.h @@ -46,7 +46,6 @@ #define VFL_TYPE_VTX 3 /* Video standard functions */ -extern unsigned int v4l2_video_std_fps(struct v4l2_standard *vs); extern char *v4l2_norm_to_name(v4l2_std_id id); extern int v4l2_video_std_construct(struct v4l2_standard *vs, int id, char *name); diff --git a/linux/include/media/videobuf-core.h b/linux/include/media/videobuf-core.h index dd0821f40..a2f55ff24 100644 --- a/linux/include/media/videobuf-core.h +++ b/linux/include/media/videobuf-core.h @@ -241,6 +241,9 @@ unsigned int videobuf_poll_stream(struct file *file, int videobuf_mmap_setup(struct videobuf_queue *q, unsigned int bcount, unsigned int bsize, enum v4l2_memory memory); +int __videobuf_mmap_setup(struct videobuf_queue *q, + unsigned int bcount, unsigned int bsize, + enum v4l2_memory memory); int videobuf_mmap_free(struct videobuf_queue *q); int videobuf_mmap_mapper(struct videobuf_queue *q, struct vm_area_struct *vma); |