From d4e7b1d0c3e29c370980e8bb900877e19a16517c Mon Sep 17 00:00:00 2001 From: Mike Isely Date: Sun, 8 Mar 2009 19:14:07 -0300 Subject: [PATCH] --- yaml --- r: 138313 b: refs/heads/master c: defeb0b94b6acf929e82b66dbc1fcb48b9204c70 h: refs/heads/master i: 138311: 9bb36ee42dc43aa4f488b9bc4aa30045b4a6afed v: v3 --- [refs] | 2 +- trunk/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b26aca0bf4db..f67f91568158 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a3bab8eb02f9413b802540530ea390d8d063e43 +refs/heads/master: defeb0b94b6acf929e82b66dbc1fcb48b9204c70 diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-v4l2.c index b7caf135ed55..9e0f2b07b93b 100644 --- a/trunk/drivers/media/video/pvrusb2/pvrusb2-v4l2.c +++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-v4l2.c @@ -952,10 +952,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); }