diff options
Diffstat (limited to 'linux/drivers/media/video/bttv-driver.c')
| -rw-r--r-- | linux/drivers/media/video/bttv-driver.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c index 0f7ba5314..1864129b3 100644 --- a/linux/drivers/media/video/bttv-driver.c +++ b/linux/drivers/media/video/bttv-driver.c @@ -1,5 +1,5 @@ /* - $Id: bttv-driver.c,v 1.26 2004/11/07 13:17:14 kraxel Exp $ + $Id: bttv-driver.c,v 1.27 2004/11/07 14:44:59 kraxel Exp $ bttv - Bt848 frame grabber driver @@ -2154,7 +2154,6 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file, if (btv->errors) bttv_reinit_bt848(btv); -#ifdef VIDIOC_G_PRIORITY switch (cmd) { case VIDIOCSFREQ: case VIDIOCSTUNER: @@ -2168,7 +2167,7 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file, if (0 != retval) return retval; }; -#endif + switch (cmd) { /* *** v4l1 *** ************************************************ */ @@ -2777,7 +2776,6 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file, return 0; } -#ifdef VIDIOC_G_PRIORITY case VIDIOC_G_PRIORITY: { enum v4l2_priority *p = arg; @@ -2791,8 +2789,6 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file, return v4l2_prio_change(&btv->prio, &fh->prio, *prio); } -#endif - case VIDIOC_ENUMSTD: case VIDIOC_G_STD: @@ -2949,9 +2945,7 @@ static int bttv_open(struct inode *inode, struct file *file) *fh = btv->init; fh->type = type; fh->ov.setup_ok = 0; -#ifdef VIDIOC_G_PRIORITY v4l2_prio_open(&btv->prio,&fh->prio); -#endif videobuf_queue_init(&fh->cap, &bttv_video_qops, btv->c.pci, &btv->s_lock, @@ -3002,9 +2996,7 @@ static int bttv_release(struct inode *inode, struct file *file) free_btres(btv,fh,RESOURCE_VBI); } -#ifdef VIDIOC_G_PRIORITY v4l2_prio_close(&btv->prio,&fh->prio); -#endif file->private_data = NULL; kfree(fh); @@ -3746,9 +3738,7 @@ static int __devinit bttv_probe(struct pci_dev *dev, INIT_LIST_HEAD(&btv->c.subs); INIT_LIST_HEAD(&btv->capture); INIT_LIST_HEAD(&btv->vcapture); -#ifdef VIDIOC_G_PRIORITY v4l2_prio_init(&btv->prio); -#endif init_timer(&btv->timeout); btv->timeout.function = bttv_irq_timeout; |