diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-25 14:32:18 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-25 14:32:18 -0300 |
| commit | 91cb86194d6146eb1da0f838116b5bc752a0c62d (patch) | |
| tree | f9059fb0da363883dbc759d7b68ea1ed5616723a /linux/drivers/media/video/usbvideo | |
| parent | dac7e782978c3029d3fa21243295837f262ccac8 (diff) | |
| parent | a325b0a427757946052053834c1dbbc50f89526c (diff) | |
| download | mediapointer-dvb-s2-91cb86194d6146eb1da0f838116b5bc752a0c62d.tar.gz mediapointer-dvb-s2-91cb86194d6146eb1da0f838116b5bc752a0c62d.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/tuner
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/usbvideo')
| -rw-r--r-- | linux/drivers/media/video/usbvideo/usbvideo.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/usbvideo/vicam.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/linux/drivers/media/video/usbvideo/usbvideo.c b/linux/drivers/media/video/usbvideo/usbvideo.c index cbfa4078e..e9b305a77 100644 --- a/linux/drivers/media/video/usbvideo/usbvideo.c +++ b/linux/drivers/media/video/usbvideo/usbvideo.c @@ -946,7 +946,9 @@ static const struct file_operations usbvideo_fops = { .read = usbvideo_v4l_read, .mmap = usbvideo_v4l_mmap, .ioctl = usbvideo_v4l_ioctl, +#ifdef CONFIG_COMPAT .compat_ioctl = v4l_compat_ioctl32, +#endif .llseek = no_llseek, }; static const struct video_device usbvideo_template = { diff --git a/linux/drivers/media/video/usbvideo/vicam.c b/linux/drivers/media/video/usbvideo/vicam.c index a9440a8c1..984f4b756 100644 --- a/linux/drivers/media/video/usbvideo/vicam.c +++ b/linux/drivers/media/video/usbvideo/vicam.c @@ -1072,7 +1072,9 @@ static const struct file_operations vicam_fops = { .read = vicam_read, .mmap = vicam_mmap, .ioctl = vicam_ioctl, +#ifdef CONFIG_COMPAT .compat_ioctl = v4l_compat_ioctl32, +#endif .llseek = no_llseek, }; |