Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / drivers / media / video / cpia.h

diff --git a/drivers/media/video/cpia.h b/drivers/media/video/cpia.h
index 6eaa692..dde27a6 100644 (file)
--- a/drivers/media/video/cpia.h
+++ b/drivers/media/video/cpia.h
@@ -45,7 +45,6 @@
 
 #include <asm/uaccess.h>
 #include <linux/videodev.h>
-#include <media/v4l2-common.h>
 #include <linux/list.h>
 #include <linux/smp_lock.h>
 #include <linux/mutex.h>
@@ -248,7 +247,7 @@ enum v4l_camstates {
 struct cam_data {
        struct list_head cam_data_list;
 
-       struct mutex busy_lock;         /* guard against SMP multithreading */
+       struct mutex busy_lock;     /* guard against SMP multithreading */
        struct cpia_camera_ops *ops;    /* lowlevel driver operations */
        void *lowlevel_data;            /* private data for lowlevel driver */
        u8 *raw_image;                  /* buffer for raw image data */