Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[linux-2.6] / drivers / media / video / se401.h

diff --git a/drivers/media/video/se401.h b/drivers/media/video/se401.h
index a7a216bd4413cb4554e9ab656bff86c40363dabb..835ef872e80375af580d676d5616ce0635f9a536 100644 (file)
--- a/drivers/media/video/se401.h
+++ b/drivers/media/video/se401.h
@@ -4,7 +4,7 @@
 
 #include <asm/uaccess.h>
 #include <linux/videodev.h>
-#include <linux/smp_lock.h>
+#include <media/v4l2-common.h>
 #include <linux/mutex.h>
 
 #define se401_DEBUG    /* Turn on debug messages */