diff options
| author |  Linus Torvalds <torvalds@g5.osdl.org>
| 2006-01-09 13:03:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org>
| 2006-01-09 13:03:58 -0800 |
| commit | f17578decc40df8fceff82b106582e30bdfb3189 (patch) | |
| tree | 911a435a2094ac03ae649f020237674224e4124a /drivers/usb/media/usbvideo.c | |
| parent | [PATCH] Fix more "if ((err = foo() < 0))" typos (diff) | |
| parent | V4L/DVB (3336): Bluebird firmware hosting moved to common dvb firmware dir on... (diff) | |
| download | linux-f17578decc40df8fceff82b106582e30bdfb3189.tar.gz linux-f17578decc40df8fceff82b106582e30bdfb3189.tar.bz2 linux-f17578decc40df8fceff82b106582e30bdfb3189.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Diffstat (limited to 'drivers/usb/media/usbvideo.c')
| -rw-r--r-- | drivers/usb/media/usbvideo.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/media/usbvideo.c b/drivers/usb/media/usbvideo.c index 4bd113325ef9..63a72e550a1b 100644 --- a/drivers/usb/media/usbvideo.c +++ b/drivers/usb/media/usbvideo.c @@ -953,6 +953,7 @@ static struct file_operations usbvideo_fops = { .read = usbvideo_v4l_read, .mmap = usbvideo_v4l_mmap, .ioctl = usbvideo_v4l_ioctl, + .compat_ioctl = v4l_compat_ioctl32, .llseek = no_llseek, }; static const struct video_device usbvideo_template = { |