diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2013-10-31 13:06:01 -0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-10-31 13:06:01 -0400 |
| commit | f8d9f628e1f16939ebc181a8f3f8ed31af4aee00 (patch) | |
| tree | a1d547bf427dd09a774815424a98d39dfb20ea3c /include/linux | |
| parent | f0dad6e701cb66301287074c39183c7312139530 (diff) | |
| parent | db60d8da8f643586c95f8fc3e383954f8c57f1f3 (diff) | |
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 { | |||
| 67 | #define ITCCHEN BIT(23) | 67 | #define ITCCHEN BIT(23) |
| 68 | 68 | ||
| 69 | /*ch_status paramater of callback function possible values*/ | 69 | /*ch_status paramater of callback function possible values*/ |
| 70 | #define DMA_COMPLETE 1 | 70 | #define EDMA_DMA_COMPLETE 1 |
| 71 | #define DMA_CC_ERROR 2 | 71 | #define EDMA_DMA_CC_ERROR 2 |
| 72 | #define DMA_TC1_ERROR 3 | 72 | #define EDMA_DMA_TC1_ERROR 3 |
| 73 | #define DMA_TC2_ERROR 4 | 73 | #define EDMA_DMA_TC2_ERROR 4 |
| 74 | 74 | ||
| 75 | enum address_mode { | 75 | enum address_mode { |
| 76 | INCR = 0, | 76 | INCR = 0, |