Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[sfrench/cifs-2.6.git] / drivers / media / video / ov511.h

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