X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=include%2Fmedia%2Fsaa7146_vv.h;h=6bbb0d93bb5f39b34a368a450b73caae2eeccd66;hb=77587c5627aab50636ea0f93c28d2013cd0b7004;hp=e49f7e156061c8dd699060a5b6c1e3edd4c3c268;hpb=c1accaa21bdef38ec0f36eaaf7ce3384fff9d0c5;p=safe%2Fjmp%2Flinux-2.6

diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h
index e49f7e1..6bbb0d9 100644
--- 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>
 
@@ -216,8 +216,7 @@ void saa7146_set_gpio(struct saa7146_dev *saa, u8 pin, u8 data);
 extern struct saa7146_use_ops saa7146_video_uops;
 int saa7146_start_preview(struct saa7146_fh *fh);
 int saa7146_stop_preview(struct saa7146_fh *fh);
-int saa7146_video_do_ioctl(struct inode *inode, struct file *file,
-			   unsigned int cmd, void *arg);
+int saa7146_video_do_ioctl(struct file *file, unsigned int cmd, void *arg);
 
 /* from saa7146_vbi.c */
 extern struct saa7146_use_ops saa7146_vbi_uops;