diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-08-02 14:00:22 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-08-02 14:00:22 -0300 |
| commit | 945cc5b96689adb1090d982863405f3bbe3f80ed (patch) | |
| tree | 3dadac2b4f334cefd84c3f64e1f362efd9d7be77 /linux/drivers/media/common | |
| parent | 8475eef2726e79505dcd133e9a23a9dc5f849d52 (diff) | |
| download | mediapointer-dvb-s2-945cc5b96689adb1090d982863405f3bbe3f80ed.tar.gz mediapointer-dvb-s2-945cc5b96689adb1090d982863405f3bbe3f80ed.tar.bz2 | |
V4L2 Conversion: saa5246a, saa5249, vino, hexium_orion, hexium_gemini
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Just a few adjustments were required on those drivers to be V4L2 compliant.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/common')
| -rw-r--r-- | linux/drivers/media/common/Kconfig | 1 | ||||
| -rw-r--r-- | linux/drivers/media/common/saa7146_fops.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/common/saa7146_video.c | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/common/Kconfig b/linux/drivers/media/common/Kconfig index 1a04db455..f33e5d973 100644 --- a/linux/drivers/media/common/Kconfig +++ b/linux/drivers/media/common/Kconfig @@ -4,7 +4,6 @@ config VIDEO_SAA7146 config VIDEO_SAA7146_VV tristate - select VIDEO_V4L2 select VIDEO_BUF select VIDEO_VIDEOBUF select VIDEO_SAA7146 diff --git a/linux/drivers/media/common/saa7146_fops.c b/linux/drivers/media/common/saa7146_fops.c index 20016d2cd..da82d6823 100644 --- a/linux/drivers/media/common/saa7146_fops.c +++ b/linux/drivers/media/common/saa7146_fops.c @@ -456,7 +456,6 @@ static void vv_callback(struct saa7146_dev *dev, unsigned long status) static struct video_device device_template = { - .hardware = VID_HARDWARE_SAA7146, .fops = &video_fops, .minor = -1, }; diff --git a/linux/drivers/media/common/saa7146_video.c b/linux/drivers/media/common/saa7146_video.c index 480c09122..8b5dce34d 100644 --- a/linux/drivers/media/common/saa7146_video.c +++ b/linux/drivers/media/common/saa7146_video.c @@ -1191,6 +1191,7 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int } return err; } +#ifdef VIDEO_V4L1_COMPAT case VIDIOCGMBUF: { struct video_mbuf *mbuf = arg; @@ -1219,6 +1220,7 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int mutex_unlock(&q->lock); return 0; } +#endif default: return v4l_compat_translate_ioctl(inode,file,cmd,arg, saa7146_video_do_ioctl); |