Merge branch '83xx' into for_paulus

[linux-2.6] / drivers / media / video / vino.c

diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c
index a8c101494cf575f947fd804eccdde524140bb1ec..268e69fdefc6f3194fdcdc3cc2902fffbd642c3b 100644 (file)
--- a/drivers/media/video/vino.c
+++ b/drivers/media/video/vino.c
@@ -40,7 +40,7 @@
 #include <linux/i2c-algo-sgi.h>
 
 #include <linux/videodev.h>
-#include <linux/videodev2.h>
+#include <media/v4l2-common.h>
 #include <linux/video_decoder.h>
 #include <linux/mutex.h>