summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-04-02 09:35:05 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-04-02 09:35:05 -0300
commitf538287daa555411910d95317990cce75e57225a (patch)
tree30cf704351cb345da7c72cbcec8fcee93db56dfd /linux/drivers/media/video
parent1022e152b0486dbbc19e49c9bbbdec12a0637418 (diff)
downloadmediapointer-dvb-s2-f538287daa555411910d95317990cce75e57225a.tar.gz
mediapointer-dvb-s2-f538287daa555411910d95317990cce75e57225a.tar.bz2
cpia2: fix function prototype
From: Randy Dunlap <rdunlap@xenotime.net> 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) kernel-sync Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video')
-rw-r--r--linux/drivers/media/video/cpia2/cpia2.h2
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);