Merge branch 'ep93xx' into for-2.6.36

[cascardo/linux.git] / drivers / media / video / cpia2 / cpia2.h

diff --git a/drivers/media/video/cpia2/cpia2.h b/drivers/media/video/cpia2/cpia2.h
index 95d3afa..8d2dfc1 100644 (file)
--- a/drivers/media/video/cpia2/cpia2.h
+++ b/drivers/media/video/cpia2/cpia2.h
@@ -33,6 +33,7 @@
 
 #include <linux/version.h>
 #include <linux/videodev.h>
+#include <media/v4l2-common.h>
 #include <linux/usb.h>
 #include <linux/poll.h>
 
@@ -49,10 +50,6 @@
 /***
  * Image defines
  ***/
-#ifndef true
-#define true 1
-#define false 0
-#endif
 
 /*  Misc constants */
 #define ALLOW_CORRUPT 0                /* Causes collater to discard checksum */
@@ -381,7 +378,7 @@ struct cpia2_fh {
 
 struct camera_data {
        /* locks */
-       struct semaphore busy_lock;     /* guard against SMP multithreading */
+       struct mutex busy_lock; /* guard against SMP multithreading */
        struct v4l2_prio_state prio;
 
        /* camera status */
@@ -456,7 +453,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);