diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-26 22:17:48 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-26 22:17:48 -0300 |
| commit | 09aaab39357cabdaf8446e398d8eea2aee045d11 (patch) | |
| tree | adebb16a1d12259e0a335fd60443f56a4e6dda67 /linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | |
| parent | 885a23d5d3b31b99d23ef1d05b212d9e3fbba93f (diff) | |
| parent | 355b49a5385160b8c9a02ba6ef84f6dfaa9e74b9 (diff) | |
| download | mediapointer-dvb-s2-09aaab39357cabdaf8446e398d8eea2aee045d11.tar.gz mediapointer-dvb-s2-09aaab39357cabdaf8446e398d8eea2aee045d11.tar.bz2 | |
merge: http://linuxtv.org/hg/~awalls/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c')
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c index e4bf0278c..c7fc605f8 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c @@ -953,10 +953,6 @@ static long pvr2_v4l2_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { -/* Temporary hack : use ivtv api until a v4l2 one is available. */ -#define IVTV_IOC_G_CODEC 0xFFEE7703 -#define IVTV_IOC_S_CODEC 0xFFEE7704 - if (cmd == IVTV_IOC_G_CODEC || cmd == IVTV_IOC_S_CODEC) return 0; return video_usercopy(file, cmd, arg, pvr2_v4l2_do_ioctl); } |