diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-29 18:06:26 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-29 18:06:26 -0300 |
| commit | f55b2be52b11947513cc6fc58b8ec2e5b3bea3e3 (patch) | |
| tree | 88701fd5467463f8da49ed3565bae946797dc045 /linux/drivers/media/video/cpia2/cpia2.h | |
| parent | c2f053a3449de316fe16d31c02dffd44e8102693 (diff) | |
| download | mediapointer-dvb-s2-f55b2be52b11947513cc6fc58b8ec2e5b3bea3e3.tar.gz mediapointer-dvb-s2-f55b2be52b11947513cc6fc58b8ec2e5b3bea3e3.tar.bz2 | |
Kernel-sync changes to -git
From: Mauro Carvalho Chehab <mchehab@infradead.org>
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 a53056c82..7480c1827 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 *buf, unsigned long count, int noblock); + char __user *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); |