From b4a0b844c24c1b13189d7df39d617b02006f2025 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Tue, 1 May 2007 22:13:47 -0300
Subject: [PATCH] --- yaml --- r: 56067 b: refs/heads/master c:
 32a1db42480dc972e8e92be68d9e604f6aff5381 h: refs/heads/master i:   56065:
 fd8862e930708938f673d06121d4eb4549ffe3c0   56063:
 88196c36e75b2f041a28ebacb612c9be93c1bd9c v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/media/common/saa7146_fops.c | 1 -
 trunk/include/media/saa7146_vv.h          | 2 ++
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8ef940590610..0b5e83ebd2f6 100644
--- 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
index c18a5da64934..b4770aecc01d 100644
--- 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
index 50e33b0e9349..cce20ed5cf6c 100644
--- 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;