Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

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

diff --git a/drivers/media/video/cpia.h b/drivers/media/video/cpia.h
index dde27a6a4a095bbc084cfe1f96d58d58466f12c3..78392fb6f94ea3dd8b430f338024b73d86a5842c 100644 (file)
--- a/drivers/media/video/cpia.h
+++ b/drivers/media/video/cpia.h
@@ -45,8 +45,8 @@
 
 #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>
 
 struct cpia_camera_ops
@@ -247,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 */