diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-11-07 08:46:07 +0100 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-11-07 08:46:07 +0100 |
| commit | 8bf5ff37ec43c9afcf8a352754624f6462c06a02 (patch) | |
| tree | c407189bc8a36c3b5d452a13692037949858e7f2 /linux/drivers/media/video/pwc/pwc.h | |
| parent | 4c6dca7b19e1055dd0d4aaa8123c9a832f117202 (diff) | |
| parent | 17490135b2a7a46fc7fb67d64dbaeb1301ea169d (diff) | |
| download | mediapointer-dvb-s2-8bf5ff37ec43c9afcf8a352754624f6462c06a02.tar.gz mediapointer-dvb-s2-8bf5ff37ec43c9afcf8a352754624f6462c06a02.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/pwc/pwc.h')
| -rw-r--r-- | linux/drivers/media/video/pwc/pwc.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linux/drivers/media/video/pwc/pwc.h b/linux/drivers/media/video/pwc/pwc.h index 926defb11..ade796037 100644 --- a/linux/drivers/media/video/pwc/pwc.h +++ b/linux/drivers/media/video/pwc/pwc.h @@ -341,8 +341,7 @@ extern int pwc_camera_power(struct pwc_device *pdev, int power); extern int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg); /** Functions in pwc-v4l.c */ -extern int pwc_video_do_ioctl(struct inode *inode, struct file *file, - unsigned int cmd, void *arg); +extern int pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg); /** pwc-uncompress.c */ /* Expand frame to image, possibly including decompression. Uses read_frame and fill_image */ |