aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2007-05-01 21:13:47 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-05-09 09:12:41 -0400
commit32a1db42480dc972e8e92be68d9e604f6aff5381 (patch)
tree665b151a13eb8f087f6afd00e34bd89fee04d277
parentff01652cf856bf2da3b7411255c239d717d08241 (diff)
V4L/DVB (5591): Saa7146: proper prototype for saa7146_video_do_ioctl()
This patch adds a proper prototype for saa7146_video_do_ioctl() in include/media/saa7146_vv.h. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Oliver Endriss <o.endriss@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/common/saa7146_fops.c1
-rw-r--r--include/media/saa7146_vv.h2
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
310int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int cmd, void *arg);
311static int fops_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) 310static 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);
216extern struct saa7146_use_ops saa7146_video_uops; 216extern struct saa7146_use_ops saa7146_video_uops;
217int saa7146_start_preview(struct saa7146_fh *fh); 217int saa7146_start_preview(struct saa7146_fh *fh);
218int saa7146_stop_preview(struct saa7146_fh *fh); 218int saa7146_stop_preview(struct saa7146_fh *fh);
219int 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 */
221extern struct saa7146_use_ops saa7146_vbi_uops; 223extern struct saa7146_use_ops saa7146_vbi_uops;