diff --git a/[refs] b/[refs]
index e6319d0e3edd..840972eae779 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07151724a35e8e70f1aa64ce30a5a3f5c1ad49a3
+refs/heads/master: fb9c280d4c6d4586670e3dfd041d8258db36b330
diff --git a/trunk/drivers/media/video/cpia2/cpia2.h b/trunk/drivers/media/video/cpia2/cpia2.h
index 8394283993f6..1764991b0ac9 100644
--- a/trunk/drivers/media/video/cpia2/cpia2.h
+++ b/trunk/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);