diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-27 22:59:59 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-27 22:59:59 -0400 |
| commit | 8ce7a9c159c8c4eb480f0a65c6af753dbf9a1a70 (patch) | |
| tree | be59573c0af3617d0cd8a7d61f0ed119e58b1156 /drivers/media/video/pwc/pwc-if.c | |
| parent | d2afb3ae04e36dbc6e9eb2d8bd54406ff7b6b3bd (diff) | |
| parent | 01da5fd83d6b2c5e36b77539f6cbdd8f49849225 (diff) | |
Merge ../linux-2.6
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 = { |