Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

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

diff --git a/drivers/media/video/ov511.h b/drivers/media/video/ov511.h
index 12b3d51e1c343bdd77c0d66f99d7962562d71af7..18c64222dd11f7f4a38bab979165085e2863bf2f 100644 (file)
--- a/drivers/media/video/ov511.h
+++ b/drivers/media/video/ov511.h
@@ -3,7 +3,7 @@
 
 #include <asm/uaccess.h>
 #include <linux/videodev.h>
-#include <linux/smp_lock.h>
+#include <media/v4l2-common.h>
 #include <linux/usb.h>
 #include <linux/mutex.h>