diff options
-rw-r--r-- | drivers/media/common/saa7146_fops.c | 1 | ||||
-rw-r--r-- | include/media/saa7146_vv.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c index c18a5da64934..b4770aecc01d 100644 --- a/drivers/media/common/saa7146_fops.c +++ b/drivers/media/common/saa7146_fops.c | |||
@@ -307,7 +307,6 @@ static int fops_release(struct inode *inode, struct file *file) | |||
307 | return 0; | 307 | return 0; |
308 | } | 308 | } |
309 | 309 | ||
310 | int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int cmd, void *arg); | ||
311 | static int fops_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) | 310 | static int fops_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) |
312 | { | 311 | { |
313 | /* | 312 | /* |
diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h index 50e33b0e9349..cce20ed5cf6c 100644 --- a/include/media/saa7146_vv.h +++ b/include/media/saa7146_vv.h | |||
@@ -216,6 +216,8 @@ void saa7146_set_gpio(struct saa7146_dev *saa, u8 pin, u8 data); | |||
216 | extern struct saa7146_use_ops saa7146_video_uops; | 216 | extern struct saa7146_use_ops saa7146_video_uops; |
217 | int saa7146_start_preview(struct saa7146_fh *fh); | 217 | int saa7146_start_preview(struct saa7146_fh *fh); |
218 | int saa7146_stop_preview(struct saa7146_fh *fh); | 218 | int saa7146_stop_preview(struct saa7146_fh *fh); |
219 | int saa7146_video_do_ioctl(struct inode *inode, struct file *file, | ||
220 | unsigned int cmd, void *arg); | ||
219 | 221 | ||
220 | /* from saa7146_vbi.c */ | 222 | /* from saa7146_vbi.c */ |
221 | extern struct saa7146_use_ops saa7146_vbi_uops; | 223 | extern struct saa7146_use_ops saa7146_vbi_uops; |