diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-21 06:21:08 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-21 06:21:08 -0500 |
| commit | c2a7dcad9f0d92d7a96e735abb8bec7b9c621536 (patch) | |
| tree | bf9b20fdd5ab07e5b0e4e0b95c6a3dbab1005cb9 /include/media | |
| parent | 373a6da165ac3012a74fd072da340eabca55d031 (diff) | |
| parent | ea67db4cdbbf7f4e74150e71da0984e25121f500 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/videobuf-core.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h index 0fa5d5912555..4fd5d0eaa935 100644 --- a/include/media/videobuf-core.h +++ b/include/media/videobuf-core.h | |||
| @@ -208,6 +208,8 @@ int videobuf_cgmbuf(struct videobuf_queue *q, | |||
| 208 | int videobuf_streamon(struct videobuf_queue *q); | 208 | int videobuf_streamon(struct videobuf_queue *q); |
| 209 | int videobuf_streamoff(struct videobuf_queue *q); | 209 | int videobuf_streamoff(struct videobuf_queue *q); |
| 210 | 210 | ||
| 211 | void videobuf_stop(struct videobuf_queue *q); | ||
| 212 | |||
| 211 | int videobuf_read_start(struct videobuf_queue *q); | 213 | int videobuf_read_start(struct videobuf_queue *q); |
| 212 | void videobuf_read_stop(struct videobuf_queue *q); | 214 | void videobuf_read_stop(struct videobuf_queue *q); |
| 213 | ssize_t videobuf_read_stream(struct videobuf_queue *q, | 215 | ssize_t videobuf_read_stream(struct videobuf_queue *q, |