---

yaml --- r: 56067 b: refs/heads/master c: 32a1db4 h: refs/heads/master i: 56065: fd8862e 56063: 88196c3 v: v3
git-mirror · May 9, 2007 · b4a0b84 · b4a0b84
1 parent e412ff4
commit b4a0b84
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff01652cf856bf2da3b7411255c239d717d08241
+refs/heads/master: 32a1db42480dc972e8e92be68d9e604f6aff5381
diff --git a/trunk/drivers/media/common/saa7146_fops.c b/trunk/drivers/media/common/saa7146_fops.c
@@ -307,7 +307,6 @@ static int fops_release(struct inode *inode, struct file *file)
 	return 0;
 }
 
-int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int cmd, void *arg);
 static int fops_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
 {
 /*

diff --git a/trunk/include/media/saa7146_vv.h b/trunk/include/media/saa7146_vv.h
@@ -216,6 +216,8 @@ 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);
 
 /* from saa7146_vbi.c */
 extern struct saa7146_use_ops saa7146_vbi_uops;
-Original file line number
+Diff line change
@@ Expand Up @@
     	return 0;
     }
-    int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int cmd, void *arg);
     static int fops_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
     {
     /*
@@ Expand Down @@