diff options
| author | Vinod Koul | 2013-10-31 18:06:01 +0100 |
|---|---|---|
| committer | Vinod Koul | 2013-10-31 18:06:01 +0100 |
| commit | f8d9f628e1f16939ebc181a8f3f8ed31af4aee00 (patch) | |
| tree | a1d547bf427dd09a774815424a98d39dfb20ea3c /include/linux | |
| parent | Merge branch 'dma_complete' into next (diff) | |
| parent | dmanengine: fix edma driver to not define DMA_COMPLETE (diff) | |
| download | kernel-qcow2-linux-f8d9f628e1f16939ebc181a8f3f8ed31af4aee00.tar.gz kernel-qcow2-linux-f8d9f628e1f16939ebc181a8f3f8ed31af4aee00.tar.xz kernel-qcow2-linux-f8d9f628e1f16939ebc181a8f3f8ed31af4aee00.zip | |
Merge branch 'dma_complete' into next
Diffstat (limited to 'include/linux')
| -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, |