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/vicam.c | |
| parent | 682e852e2638ed0aff84aa51181c9e5d2f939562 (diff) | |
| parent | cec418346e5a411e907293aba7cc21ac53c95834 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Diffstat (limited to 'drivers/usb/media/vicam.c')
| -rw-r--r-- | drivers/usb/media/vicam.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/media/vicam.c b/drivers/usb/media/vicam.c index 1c73155c8d77..5df144073871 100644 --- a/drivers/usb/media/vicam.c +++ b/drivers/usb/media/vicam.c | |||
| @@ -1236,6 +1236,7 @@ static struct file_operations vicam_fops = { | |||
| 1236 | .read = vicam_read, | 1236 | .read = vicam_read, |
| 1237 | .mmap = vicam_mmap, | 1237 | .mmap = vicam_mmap, |
| 1238 | .ioctl = vicam_ioctl, | 1238 | .ioctl = vicam_ioctl, |
| 1239 | .compat_ioctl = v4l_compat_ioctl32, | ||
| 1239 | .llseek = no_llseek, | 1240 | .llseek = no_llseek, |
| 1240 | }; | 1241 | }; |
| 1241 | 1242 | ||