diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-31 01:45:48 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-31 01:45:48 -0400 |
| commit | aa43f77939c97bf9d3580c6a5e71a5a40290e451 (patch) | |
| tree | 095c0b8b3da4b6554a3f8ef4b39240a5d9216d4d /drivers/media/video/pwc/pwc-if.c | |
| parent | 2818c5dec5e28d65d52afbb7695bbbafe6377ee5 (diff) | |
| parent | 4c15343167b5febe7bb0ba96aad5bef42ae94d3b (diff) | |
Merge branch 'merge'
Diffstat (limited to 'drivers/media/video/pwc/pwc-if.c')
| -rw-r--r-- | drivers/media/video/pwc/pwc-if.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c index 47d0d83a0264..d4703944df9c 100644 --- a/drivers/media/video/pwc/pwc-if.c +++ b/drivers/media/video/pwc/pwc-if.c | |||
| @@ -160,6 +160,7 @@ static struct file_operations pwc_fops = { | |||
| 160 | .poll = pwc_video_poll, | 160 | .poll = pwc_video_poll, |
| 161 | .mmap = pwc_video_mmap, | 161 | .mmap = pwc_video_mmap, |
| 162 | .ioctl = pwc_video_ioctl, | 162 | .ioctl = pwc_video_ioctl, |
| 163 | .compat_ioctl = v4l_compat_ioctl32, | ||
| 163 | .llseek = no_llseek, | 164 | .llseek = no_llseek, |
| 164 | }; | 165 | }; |
| 165 | static struct video_device pwc_template = { | 166 | static struct video_device pwc_template = { |