Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 261415
b: refs/heads/master
c: 2872094
h: refs/heads/master
i:
  261413: 9f8950a
  261411: 3efd6e7
  261407: 748f75b
v: v3
  • Loading branch information
Jonathan Corbet authored and Mauro Carvalho Chehab committed Jul 27, 2011
1 parent a802224 commit 59a6f27
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cbc4f3a277ce52c217457ce08f433d8e9ad4925f
refs/heads/master: 28720944d86b4d187360daa8be67dd22cb4e897b
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/marvell-ccic/mmp-driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 59a6f27

Please sign in to comment.