diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-05 20:04:56 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-05 20:04:56 -0200 |
| commit | 7af33dc182a51e3feda1246207c939d8459dbd61 (patch) | |
| tree | 81416520e5321725fa97909e5652ed7c87598893 /linux/drivers/media/common/saa7146_video.c | |
| parent | 1272389ee0a46d702d0dc471d791b9fae7668aed (diff) | |
| parent | b4efb4ebbf8e3e7d3d0230bf4a811f7dafeef9a0 (diff) | |
| download | mediapointer-dvb-s2-7af33dc182a51e3feda1246207c939d8459dbd61.tar.gz mediapointer-dvb-s2-7af33dc182a51e3feda1246207c939d8459dbd61.tar.bz2 | |
merge: http://linuxtv.org/hg/~anttip/af9015
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/common/saa7146_video.c')
| -rw-r--r-- | linux/drivers/media/common/saa7146_video.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/linux/drivers/media/common/saa7146_video.c b/linux/drivers/media/common/saa7146_video.c index 545bb42fe..12717058e 100644 --- a/linux/drivers/media/common/saa7146_video.c +++ b/linux/drivers/media/common/saa7146_video.c @@ -835,7 +835,7 @@ static int video_end(struct saa7146_fh *fh, struct file *file) * copying is done already, arg is a kernel pointer. */ -static int __saa7146_video_do_ioctl(struct file *file, unsigned int cmd, void *arg) +int saa7146_video_do_ioctl(struct file *file, unsigned int cmd, void *arg) { struct saa7146_fh *fh = file->private_data; struct saa7146_dev *dev = fh->dev; @@ -1217,17 +1217,11 @@ static int __saa7146_video_do_ioctl(struct file *file, unsigned int cmd, void *a #endif default: return v4l_compat_translate_ioctl(file, cmd, arg, - __saa7146_video_do_ioctl); + saa7146_video_do_ioctl); } return 0; } -int saa7146_video_do_ioctl(struct inode *inode, struct file *file, - unsigned int cmd, void *arg) -{ - return __saa7146_video_do_ioctl(file, cmd, arg); -} - /*********************************************************************************/ /* buffer handling functions */ |