diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 16:03:58 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 16:03:58 -0500 |
| commit | f17578decc40df8fceff82b106582e30bdfb3189 (patch) | |
| tree | 911a435a2094ac03ae649f020237674224e4124a /drivers/usb/media/pwc | |
| parent | 682e852e2638ed0aff84aa51181c9e5d2f939562 (diff) | |
| parent | cec418346e5a411e907293aba7cc21ac53c95834 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Diffstat (limited to 'drivers/usb/media/pwc')
| -rw-r--r-- | drivers/usb/media/pwc/pwc-if.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/media/pwc/pwc-if.c b/drivers/usb/media/pwc/pwc-if.c index 09ca6128ac20..4f9b0dc6fd7b 100644 --- a/drivers/usb/media/pwc/pwc-if.c +++ b/drivers/usb/media/pwc/pwc-if.c | |||
| @@ -154,6 +154,7 @@ static struct file_operations pwc_fops = { | |||
| 154 | .poll = pwc_video_poll, | 154 | .poll = pwc_video_poll, |
| 155 | .mmap = pwc_video_mmap, | 155 | .mmap = pwc_video_mmap, |
| 156 | .ioctl = pwc_video_ioctl, | 156 | .ioctl = pwc_video_ioctl, |
| 157 | .compat_ioctl = v4l_compat_ioctl32, | ||
| 157 | .llseek = no_llseek, | 158 | .llseek = no_llseek, |
| 158 | }; | 159 | }; |
| 159 | static struct video_device pwc_template = { | 160 | static struct video_device pwc_template = { |