diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-05-23 16:53:23 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-05-23 16:53:23 +1000 |
| commit | acf464817d5e7be9fb67aec4027dbee0ac9be17a (patch) | |
| tree | 39fd061c0a91a11d3ae4ff19b7fe179325e39bbf /include/media/videobuf-core.h | |
| parent | 80d267f9aee6f1b5df602b5a19fb7b4923f17db2 (diff) | |
| parent | 8962cadbe7cbc4ed0fff94f56ebab505a10afd2e (diff) | |
Merge branch 'merge' into powerpc-next
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 5b39a22533f..874f1340d04 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); |