diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-12 02:10:06 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-12 02:10:06 -0200 |
| commit | 5021ce47870d8ce6b8efe93938138795dcc16553 (patch) | |
| tree | 1a21631be8d469ae591d7d997bd1f378287a526a /linux/include/media/saa7146_vv.h | |
| parent | d2fdf36ebdc0970621958a5b6a7df809ed103bf8 (diff) | |
| parent | a3c3f7456fd59e54b7c0333ca9bb32b8be70044e (diff) | |
| download | mediapointer-dvb-s2-5021ce47870d8ce6b8efe93938138795dcc16553.tar.gz mediapointer-dvb-s2-5021ce47870d8ce6b8efe93938138795dcc16553.tar.bz2 | |
merge: http://linuxtv.org/hg/~awalls/cx18-bugfix
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include/media/saa7146_vv.h')
| -rw-r--r-- | linux/include/media/saa7146_vv.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linux/include/media/saa7146_vv.h b/linux/include/media/saa7146_vv.h index 1d1040966..6bbb0d93b 100644 --- a/linux/include/media/saa7146_vv.h +++ b/linux/include/media/saa7146_vv.h @@ -216,8 +216,7 @@ 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); +int saa7146_video_do_ioctl(struct file *file, unsigned int cmd, void *arg); /* from saa7146_vbi.c */ extern struct saa7146_use_ops saa7146_vbi_uops; |