diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-27 09:09:07 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-27 09:09:07 -0700 |
| commit | 7da59d2fe30d8169c7c9e7b488beb1b9af932608 (patch) | |
| tree | 02438ff9c258cf80d3a3955215fbcff7bd7e392e /drivers/misc/carma/carma-fpga.c | |
| parent | fea7a08acb13524b47711625eebea40a0ede69a0 (diff) | |
| parent | 877cdf3949cc67d00677a1dfb913001f324ac40d (diff) | |
Merge v3.6-rc3 into 'char-misc-next'
This resolves a conflict in:
drivers/misc/mei/interrupt.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/carma/carma-fpga.c')
| -rw-r--r-- | drivers/misc/carma/carma-fpga.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/carma/carma-fpga.c b/drivers/misc/carma/carma-fpga.c index 8c279da0741..0c43297ed9a 100644 --- a/drivers/misc/carma/carma-fpga.c +++ b/drivers/misc/carma/carma-fpga.c @@ -666,7 +666,7 @@ static int data_submit_dma(struct fpga_device *priv, struct data_buf *buf) src = SYS_FPGA_BLOCK; tx = chan->device->device_prep_dma_memcpy(chan, dst, src, REG_BLOCK_SIZE, - DMA_PREP_INTERRUPT); + 0); if (!tx) { dev_err(priv->dev, "unable to prep SYS-FPGA DMA\n"); return -ENOMEM; |