diff options
author | Randy Dunlap <rdunlap@xenotime.net> | 2006-03-29 16:15:23 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-02 05:02:33 -0300 |
commit | fb9c280d4c6d4586670e3dfd041d8258db36b330 (patch) | |
tree | a260f5b811fbe8f0b12dde41e05d3c13d9acd2c7 /drivers/media/video/cpia2 | |
parent | 07151724a35e8e70f1aa64ce30a5a3f5c1ad49a3 (diff) | |
download | linux-stable-fb9c280d4c6d4586670e3dfd041d8258db36b330.tar.gz linux-stable-fb9c280d4c6d4586670e3dfd041d8258db36b330.tar.bz2 linux-stable-fb9c280d4c6d4586670e3dfd041d8258db36b330.zip |
V4L/DVB (3667b): cpia2: fix function prototype
Fix address space warning (from sparse):
drivers/media/video/cpia2/cpia2_core.c:2355:6: error: symbol 'cpia2_read' redeclared with different type (originally declared at drivers/media/video/cpia2/cpia2.h:458) - incompatible argument 2 (different address spaces)
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cpia2')
-rw-r--r-- | drivers/media/video/cpia2/cpia2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cpia2/cpia2.h b/drivers/media/video/cpia2/cpia2.h index 8394283993f6..1764991b0ac9 100644 --- a/drivers/media/video/cpia2/cpia2.h +++ b/drivers/media/video/cpia2/cpia2.h @@ -456,7 +456,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); |