diff options
| author | Gerd Knorr <devnull@localhost> | 2004-11-07 14:44:59 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2004-11-07 14:44:59 +0000 |
| commit | 8ffa4c64409b1378cda7de9203be2113420224b5 (patch) | |
| tree | e17d7b3b9d15948f7f91e9af997e293e66835fec /linux/drivers/media/video/saa7134/saa7134-video.c | |
| parent | 1a6399de3074ab4dc6bdad694bbd8b47d486d6b2 (diff) | |
| download | mediapointer-dvb-s2-8ffa4c64409b1378cda7de9203be2113420224b5.tar.gz mediapointer-dvb-s2-8ffa4c64409b1378cda7de9203be2113420224b5.tar.bz2 | |
- kill obsolete stuff.
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-video.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-video.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-video.c b/linux/drivers/media/video/saa7134/saa7134-video.c index 885b1ab31..ef9323157 100644 --- a/linux/drivers/media/video/saa7134/saa7134-video.c +++ b/linux/drivers/media/video/saa7134/saa7134-video.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-video.c,v 1.18 2004/11/07 13:17:15 kraxel Exp $ + * $Id: saa7134-video.c,v 1.19 2004/11/07 14:44:59 kraxel Exp $ * * device driver for philips saa7134 based TV cards * video4linux video interface @@ -1232,9 +1232,7 @@ static int video_open(struct inode *inode, struct file *file) fh->fmt = format_by_fourcc(V4L2_PIX_FMT_BGR24); fh->width = 720; fh->height = 576; -#ifdef VIDIOC_G_PRIORITY v4l2_prio_open(&dev->prio,&fh->prio); -#endif videobuf_queue_init(&fh->cap, &video_qops, dev->pci, &dev->slock, @@ -1364,9 +1362,7 @@ static int video_release(struct inode *inode, struct file *file) saa7134_pgtable_free(dev->pci,&fh->pt_cap); saa7134_pgtable_free(dev->pci,&fh->pt_vbi); -#ifdef VIDIOC_G_PRIORITY v4l2_prio_close(&dev->prio,&fh->prio); -#endif file->private_data = NULL; kfree(fh); return 0; @@ -1648,7 +1644,6 @@ static int video_do_ioctl(struct inode *inode, struct file *file, if (video_debug > 1) saa7134_print_ioctl(dev->name,cmd); -#ifdef VIDIOC_G_PRIORITY switch (cmd) { case VIDIOC_S_CTRL: case VIDIOC_S_STD: @@ -1659,7 +1654,6 @@ static int video_do_ioctl(struct inode *inode, struct file *file, if (0 != err) return err; } -#endif switch (cmd) { case VIDIOC_QUERYCAP: @@ -1900,7 +1894,6 @@ static int video_do_ioctl(struct inode *inode, struct file *file, return 0; } -#ifdef VIDIOC_G_PRIORITY case VIDIOC_G_PRIORITY: { enum v4l2_priority *p = arg; @@ -1914,7 +1907,6 @@ static int video_do_ioctl(struct inode *inode, struct file *file, return v4l2_prio_change(&dev->prio, &fh->prio, *prio); } -#endif /* --- preview ioctls ---------------------------------------- */ case VIDIOC_ENUM_FMT: |