diff options
| author | Qiang Liu <qiang.liu@freescale.com> | 2012-08-09 04:23:31 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-16 13:10:02 -0400 |
| commit | 567fd1d4a66a2d6e5599be0ada582e0a3dbd23d4 (patch) | |
| tree | 328dc3d30a7c4a8672a340243ef511c00a4fd380 /drivers/misc/carma/carma-fpga-program.c | |
| parent | cfeb28525faa855b7f0bd06a330a6961f4c5127e (diff) | |
carma: remove unnecessary DMA_INTERRUPT capability
These drivers set the DMA_INTERRUPT capability bit when requesting a DMA
controller channel. This was historical, and is no longer needed.
Recent changes to the drivers/dma/fsldma.c driver have removed support
for this flag. This makes the carma drivers unable to find a DMA channel
with the required capabilities.
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/carma/carma-fpga-program.c')
| -rw-r--r-- | drivers/misc/carma/carma-fpga-program.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/misc/carma/carma-fpga-program.c b/drivers/misc/carma/carma-fpga-program.c index a2d25e4857e3..eaddfe9db149 100644 --- a/drivers/misc/carma/carma-fpga-program.c +++ b/drivers/misc/carma/carma-fpga-program.c | |||
| @@ -978,7 +978,6 @@ static int fpga_of_probe(struct platform_device *op) | |||
| 978 | dev_set_drvdata(priv->dev, priv); | 978 | dev_set_drvdata(priv->dev, priv); |
| 979 | dma_cap_zero(mask); | 979 | dma_cap_zero(mask); |
| 980 | dma_cap_set(DMA_MEMCPY, mask); | 980 | dma_cap_set(DMA_MEMCPY, mask); |
| 981 | dma_cap_set(DMA_INTERRUPT, mask); | ||
| 982 | dma_cap_set(DMA_SLAVE, mask); | 981 | dma_cap_set(DMA_SLAVE, mask); |
| 983 | dma_cap_set(DMA_SG, mask); | 982 | dma_cap_set(DMA_SG, mask); |
| 984 | 983 | ||