From: Tony Lindgren Date: Tue, 29 Apr 2008 06:03:54 +0000 (-0700) Subject: V4L: Fix compile for 24xx camera X-Git-Tag: v2.6.26-omap1~123^2~164 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7a54510c871571601c40251af8242e63dbc9ed15;p=linux-2.6-omap-h63xx.git V4L: Fix compile for 24xx camera Fix compile for 24xx camera Signed-off-by: Tony Lindgren --- diff --git a/drivers/media/video/omap/camera_core.c b/drivers/media/video/omap/camera_core.c index dce47fc676d..eeedb365f16 100644 --- a/drivers/media/video/omap/camera_core.c +++ b/drivers/media/video/omap/camera_core.c @@ -916,7 +916,7 @@ static int camera_core_open(struct inode *inode, struct file *file) vidioc_int_g_fmt_cap(cam->sdev, &format); spin_unlock(&cam->img_lock); - videobuf_queue_pci_init(&fh->vbq, &cam->vbq_ops, NULL, &cam->vbq_lock, + videobuf_queue_sg_init(&fh->vbq, &cam->vbq_ops, NULL, &cam->vbq_lock, fh->type, V4L2_FIELD_NONE, sizeof(struct videobuf_buffer), fh); diff --git a/drivers/media/video/omap24xxcam.c b/drivers/media/video/omap24xxcam.c index 4308fec19cc..dfd34796d04 100644 --- a/drivers/media/video/omap24xxcam.c +++ b/drivers/media/video/omap24xxcam.c @@ -1493,7 +1493,7 @@ static int omap24xxcam_open(struct inode *inode, struct file *file) spin_lock_init(&fh->vbq_lock); - videobuf_queue_pci_init(&fh->vbq, &omap24xxcam_vbq_ops, NULL, + videobuf_queue_sg_init(&fh->vbq, &omap24xxcam_vbq_ops, NULL, &fh->vbq_lock, V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE, sizeof(struct videobuf_buffer), fh);