diff options
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/dma/imx-sdma.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 42b96dd1f74e..34385733562d 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -224,11 +224,11 @@ config PCH_DMA config IMX_SDMA tristate "i.MX SDMA support" - depends on ARCH_MX25 || ARCH_MX3 || ARCH_MX5 + depends on ARCH_MX25 || ARCH_MX3 || ARCH_MX5 || ARCH_MX6 select DMA_ENGINE help Support the i.MX SDMA engine. This engine is integrated into - Freescale i.MX25/31/35/51 chips. + Freescale i.MX25/31/35/51/6x chips. config IMX_DMA tristate "i.MX DMA support" diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index e11d754a8c8a..0ed6c6e99ff4 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -7,7 +7,7 @@ * * Based on code from Freescale: * - * Copyright 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2004-2011 Freescale Semiconductor, Inc. * * The code contained herein is licensed under the GNU General Public * License. You may obtain a copy of the GNU General Public License @@ -794,7 +794,7 @@ static dma_cookie_t sdma_tx_submit(struct dma_async_tx_descriptor *tx) struct sdma_channel *sdmac = to_sdma_chan(tx->chan); struct sdma_engine *sdma = sdmac->sdma; dma_cookie_t cookie; - int flag; + unsigned long flag; spin_lock_irqsave(&sdmac->lock, flag); |