diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-05-24 02:24:52 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-24 02:24:52 -0400 |
| commit | d08fe475120e3f17df37656d0644c0f17a797852 (patch) | |
| tree | 64f0324afa9e884d8f0d738930a2495ba411c897 /drivers/media/video/cx18/cx18-fileops.h | |
| parent | fb66c5238547495b4a79f590b20400683702448a (diff) | |
| parent | d762f4383100c2a87b1a3f2d678cd3b5425655b4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmobile-latest
Diffstat (limited to 'drivers/media/video/cx18/cx18-fileops.h')
| -rw-r--r-- | drivers/media/video/cx18/cx18-fileops.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/cx18/cx18-fileops.h b/drivers/media/video/cx18/cx18-fileops.h index 5c8fcb884f0a..b9e5110ad043 100644 --- a/drivers/media/video/cx18/cx18-fileops.h +++ b/drivers/media/video/cx18/cx18-fileops.h | |||
| @@ -33,6 +33,8 @@ int cx18_start_capture(struct cx18_open_id *id); | |||
| 33 | void cx18_stop_capture(struct cx18_open_id *id, int gop_end); | 33 | void cx18_stop_capture(struct cx18_open_id *id, int gop_end); |
| 34 | void cx18_mute(struct cx18 *cx); | 34 | void cx18_mute(struct cx18 *cx); |
| 35 | void cx18_unmute(struct cx18 *cx); | 35 | void cx18_unmute(struct cx18 *cx); |
| 36 | int cx18_v4l2_mmap(struct file *file, struct vm_area_struct *vma); | ||
| 37 | void cx18_vb_timeout(unsigned long data); | ||
| 36 | 38 | ||
| 37 | /* Shared with cx18-alsa module */ | 39 | /* Shared with cx18-alsa module */ |
| 38 | int cx18_claim_stream(struct cx18_open_id *id, int type); | 40 | int cx18_claim_stream(struct cx18_open_id *id, int type); |