diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-02 04:51:51 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-02 04:51:51 -0300 |
| commit | ccc9a7ea538fa702d897eead24eefc64bd4960d9 (patch) | |
| tree | 6a1b68e9933c0853fc1cb4f1ec61d66589f4a5e1 /linux/drivers/media/video/cpia2/cpia2.h | |
| parent | 6499c4b8ab1554b94358bc6d69709e1c22d8b606 (diff) | |
| download | mediapointer-dvb-s2-ccc9a7ea538fa702d897eead24eefc64bd4960d9.tar.gz mediapointer-dvb-s2-ccc9a7ea538fa702d897eead24eefc64bd4960d9.tar.bz2 | |
Kernel-sync patch
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Mostly because of documentation renames from mkfrufy.
Also, a small fix at cpia2.
kernel-sync
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cpia2/cpia2.h')
| -rw-r--r-- | linux/drivers/media/video/cpia2/cpia2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cpia2/cpia2.h b/linux/drivers/media/video/cpia2/cpia2.h index 7480c1827..a53056c82 100644 --- a/linux/drivers/media/video/cpia2/cpia2.h +++ b/linux/drivers/media/video/cpia2/cpia2.h @@ -462,7 +462,7 @@ int cpia2_init_camera(struct camera_data *cam); int cpia2_allocate_buffers(struct camera_data *cam); void cpia2_free_buffers(struct camera_data *cam); long cpia2_read(struct camera_data *cam, - char __user *buf, unsigned long count, int noblock); + char *buf, unsigned long count, int noblock); unsigned int cpia2_poll(struct camera_data *cam, struct file *filp, poll_table *wait); int cpia2_remap_buffer(struct camera_data *cam, struct vm_area_struct *vma); |