From 59a6f27857b60c4f76855686fdc35c56425e579c Mon Sep 17 00:00:00 2001 From: Jonathan Corbet Date: Thu, 30 Jun 2011 17:05:28 -0300 Subject: [PATCH] --- yaml --- r: 261415 b: refs/heads/master c: 28720944d86b4d187360daa8be67dd22cb4e897b h: refs/heads/master i: 261413: 9f8950a8244e0caf51e3595f6a2b07f49e9114b4 261411: 3efd6e77dcc3427e87bdcb88f643129c3c830348 261407: 748f75b11a7f590d3a1909ef717f9bc5113cd574 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/marvell-ccic/mmp-driver.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 60bf311ab674..fed4a1d3dd2d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cbc4f3a277ce52c217457ce08f433d8e9ad4925f +refs/heads/master: 28720944d86b4d187360daa8be67dd22cb4e897b diff --git a/trunk/drivers/media/video/marvell-ccic/mmp-driver.c b/trunk/drivers/media/video/marvell-ccic/mmp-driver.c index 7b9c48c897e5..841591556994 100644 --- a/trunk/drivers/media/video/marvell-ccic/mmp-driver.c +++ b/trunk/drivers/media/video/marvell-ccic/mmp-driver.c @@ -180,7 +180,7 @@ static int mmpcam_probe(struct platform_device *pdev) mcam->dev = &pdev->dev; mcam->use_smbus = 0; mcam->chip_id = V4L2_IDENT_ARMADA610; - mcam->buffer_mode = B_vmalloc; /* Switch to dma */ + mcam->buffer_mode = B_DMA_sg; spin_lock_init(&mcam->dev_lock); /* * Get our I/O memory.