diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:23:36 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:23:36 +0200 |
| commit | 766d02786ecd22932beeb9ca8bad6d8c5a552ef9 (patch) | |
| tree | f6f2df0e35bbea914d1f4d12be6d02f128c73575 /include/media/videobuf-core.h | |
| parent | 906d882cacecd37ad2fdd03ed2a9b232bcb9507e (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into core/rcutip-core-rcu-2008-06-16_09.23_Mon
Diffstat (limited to 'include/media/videobuf-core.h')
| -rw-r--r-- | include/media/videobuf-core.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h index 5b39a22533fe..874f1340d049 100644 --- a/include/media/videobuf-core.h +++ b/include/media/videobuf-core.h @@ -237,6 +237,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); |