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 3dc88b7558bf8622df474ace57a7368e7a6587ad..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