summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2013-10-31 22:36:01 +0530
committerVinod Koul <vinod.koul@intel.com>2013-10-31 22:36:01 +0530
commitf8d9f628e1f16939ebc181a8f3f8ed31af4aee00 (patch)
treea1d547bf427dd09a774815424a98d39dfb20ea3c /include/linux
parentf0dad6e701cb66301287074c39183c7312139530 (diff)
parentdb60d8da8f643586c95f8fc3e383954f8c57f1f3 (diff)
downloadlinux-f8d9f628e1f16939ebc181a8f3f8ed31af4aee00.tar.gz
linux-f8d9f628e1f16939ebc181a8f3f8ed31af4aee00.tar.bz2
linux-f8d9f628e1f16939ebc181a8f3f8ed31af4aee00.zip
Merge branch 'dma_complete' into next
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/platform_data/edma.h8
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,