diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-10 20:30:45 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-10 20:30:45 +0200 |
| commit | 06eb4eafbdc0796d741d139a44f1253278da8611 (patch) | |
| tree | fbdb44317130c371928154c9e6903e699fe2b995 /drivers/media/video/mx3_camera.c | |
| parent | wiznet: Fix Kconfig dependencies. (diff) | |
| parent | Make the "word-at-a-time" helper functions more commonly usable (diff) | |
| download | linux-06eb4eafbdc0796d741d139a44f1253278da8611.tar.xz linux-06eb4eafbdc0796d741d139a44f1253278da8611.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/media/video/mx3_camera.c')
| -rw-r--r-- | drivers/media/video/mx3_camera.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/mx3_camera.c b/drivers/media/video/mx3_camera.c index 74522773e934..93c35ef5f0ad 100644 --- a/drivers/media/video/mx3_camera.c +++ b/drivers/media/video/mx3_camera.c @@ -286,7 +286,7 @@ static void mx3_videobuf_queue(struct vb2_buffer *vb) sg_dma_address(sg) = vb2_dma_contig_plane_dma_addr(vb, 0); sg_dma_len(sg) = new_size; - txd = ichan->dma_chan.device->device_prep_slave_sg( + txd = dmaengine_prep_slave_sg( &ichan->dma_chan, sg, 1, DMA_DEV_TO_MEM, DMA_PREP_INTERRUPT); if (!txd) |