Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[linux-2.6-omap-h63xx.git] / include / media / saa7146_vv.h

diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h
index e49f7e156061c8dd699060a5b6c1e3edd4c3c268..1d104096619cf78d779e573c6a6fb1795117e81c 100644 (file)
--- a/include/media/saa7146_vv.h
+++ b/include/media/saa7146_vv.h
@@ -1,8 +1,8 @@
 #ifndef __SAA7146_VV__
 #define __SAA7146_VV__
 
-#include <linux/videodev.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <media/saa7146.h>
 #include <media/videobuf-dma-sg.h>