diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2012-05-15 18:21:38 +0530 |
|---|---|---|
| committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2012-05-17 06:41:34 -0700 |
| commit | b245e73464dac33b2e1a62de7fb5959676ab133f (patch) | |
| tree | 21e5f6c0dccab8c80c3fe8dfeb8beb8c3bd01bfe /drivers/spi | |
| parent | 0db4788c4cc1bc77c66c34a3cee158baf7f6e507 (diff) | |
dmaengine/dma_slave: fix merge issue
Merges of dma changes from mainline reported conflict and
it was not got resolved properly.
Fix the resolution issue.
Change-Id: I7edc5effc0b9a61363e77e6cc39eb62e315396d0
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/102590
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-topcliff-pch.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c index f5c226cc1689..7d22559e54c4 100644 --- a/drivers/spi/spi-topcliff-pch.c +++ b/drivers/spi/spi-topcliff-pch.c @@ -1120,13 +1120,8 @@ static void pch_spi_handle_dma(struct pch_spi_data *data, int *bpw) sg_dma_address(sg) = dma->tx_buf_dma + sg->offset; } sg = dma->sg_tx_p; -<<<<<<< HEAD - desc_tx = dma->chan_tx->device->device_prep_slave_sg(dma->chan_tx, - sg, num, DMA_TO_DEVICE, -======= desc_tx = dmaengine_prep_slave_sg(dma->chan_tx, sg, num, DMA_MEM_TO_DEV, ->>>>>>> 1605282... dmaengine/dma_slave: introduce inline wrappers DMA_PREP_INTERRUPT | DMA_CTRL_ACK); if (!desc_tx) { dev_err(&data->master->dev, "%s:device_prep_slave_sg Failed\n", |