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/video/vino.c | |
| 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/video/vino.c')
| -rw-r--r-- | linux/drivers/media/video/vino.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/linux/drivers/media/video/vino.c b/linux/drivers/media/video/vino.c index a196756c5..0ff1ecc00 100644 --- a/linux/drivers/media/video/vino.c +++ b/linux/drivers/media/video/vino.c @@ -914,7 +914,7 @@ static int vino_allocate_buffer(struct vino_framebuffer *fb, return ret; } -#if 0 /* keep */; +#if 0 /* keep */ /* user buffers not fully implemented yet */ static int vino_prepare_user_buffer(struct vino_framebuffer *fb, void *user, @@ -1043,7 +1043,7 @@ static inline int vino_fifo_has_id(struct vino_framebuffer_fifo *f, return 0; } -#if 0 /* keep */; +#if 0 /* keep */ /* returns true/false */ static inline int vino_fifo_full(struct vino_framebuffer_fifo *f) { @@ -1399,7 +1399,7 @@ out: return ret; } -#if 0 /* keep */; +#if 0 /* keep */ static int vino_queue_get_total(struct vino_framebuffer_queue *q, unsigned int *total) { @@ -2210,7 +2210,7 @@ out: spin_unlock_irqrestore(&vcs->capture_lock, flags); } -#if 0 /* keep */; +#if 0 /* keep */ static int vino_capture_failed(struct vino_channel_settings *vcs) { struct vino_framebuffer *fb; @@ -4404,7 +4404,6 @@ static struct video_device v4l_device_template = { .name = "NOT SET", //.type = VID_TYPE_CAPTURE | VID_TYPE_SUBCAPTURE | // VID_TYPE_CLIPPING | VID_TYPE_SCALES, VID_TYPE_OVERLAY - .hardware = VID_HARDWARE_VINO, .fops = &vino_fops, .minor = -1, }; |