dmaengine/dma_slave: fix merge issue.
Linqiang Pu [Wed, 2 May 2012 13:37:27 +0000 (21:37 +0800)]
Change-Id: I0931f4ef7a5464dd32d8c703288a137fc77857ce
Signed-off-by: Linqiang Pu <dpu@nvidia.com>
Reviewed-on: http://git-master/r/100090
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>

sound/soc/sh/siu_pcm.c

index de9abd0..5cfcc65 100644 (file)
@@ -180,13 +180,8 @@ static int siu_pcm_rd_set(struct siu_port *port_info,
        sg_dma_len(&sg) = size;
        sg_dma_address(&sg) = buff;
 
-<<<<<<< HEAD
-       desc = siu_stream->chan->device->device_prep_slave_sg(siu_stream->chan,
-               &sg, 1, DMA_FROM_DEVICE, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
-=======
        desc = dmaengine_prep_slave_sg(siu_stream->chan,
                &sg, 1, DMA_DEV_TO_MEM, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
->>>>>>> 1605282... dmaengine/dma_slave: introduce inline wrappers
        if (!desc) {
                dev_err(dev, "Failed to allocate dma descriptor\n");
                return -ENOMEM;