diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2013-10-30 13:52:30 +0100 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-10-30 13:57:56 +0100 |
| commit | db60d8da8f643586c95f8fc3e383954f8c57f1f3 (patch) | |
| tree | be686ebbfd8b0f9a2a87ae7b10ed1207afb64254 /include | |
| parent | dmaengine: remove unused DMA_SUCCESS (diff) | |
| download | linux-db60d8da8f643586c95f8fc3e383954f8c57f1f3.tar.xz linux-db60d8da8f643586c95f8fc3e383954f8c57f1f3.zip | |
dmanengine: fix edma driver to not define DMA_COMPLETE
edma header defines DMA_COMPLETE, this causes issues as commit adfedd9a32e4 move
DMA_SUCCESS to DMA_COMPLETE. edma should properly namespace its defines and
needs a future fix
Reported-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/platform_data/edma.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/platform_data/edma.h b/include/linux/platform_data/edma.h index 179fb91bb5f2..f50821cb64be 100644 --- a/include/linux/platform_data/edma.h +++ b/include/linux/platform_data/edma.h @@ -67,10 +67,10 @@ struct edmacc_param { #define ITCCHEN BIT(23) /*ch_status paramater of callback function possible values*/ -#define DMA_COMPLETE 1 -#define DMA_CC_ERROR 2 -#define DMA_TC1_ERROR 3 -#define DMA_TC2_ERROR 4 +#define EDMA_DMA_COMPLETE 1 +#define EDMA_DMA_CC_ERROR 2 +#define EDMA_DMA_TC1_ERROR 3 +#define EDMA_DMA_TC2_ERROR 4 enum address_mode { INCR = 0, |