aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/dma
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2017-11-14 10:37:28 +0530
committerVinod Koul <vinod.koul@intel.com>2017-11-14 10:37:28 +0530
commitcecd5fc5512349662b9e7a9e06231055d803e3f6 (patch)
tree49a577762b0d5f7e6d95fd603db3c8a36c207969 /include/linux/dma
parentMerge branch 'topic/timer_api' into for-linus (diff)
parentdmaengine: xilinx_dma: Move enum xdma_ip_type to driver file (diff)
downloadlinux-dev-cecd5fc5512349662b9e7a9e06231055d803e3f6.tar.xz
linux-dev-cecd5fc5512349662b9e7a9e06231055d803e3f6.zip
Merge branch 'topic/xilinx' into for-linus
Diffstat (limited to 'include/linux/dma')
-rw-r--r--include/linux/dma/xilinx_dma.h14
1 files changed, 0 insertions, 14 deletions
diff --git a/include/linux/dma/xilinx_dma.h b/include/linux/dma/xilinx_dma.h
index 3ae300052553..34b98f276ed0 100644
--- a/include/linux/dma/xilinx_dma.h
+++ b/include/linux/dma/xilinx_dma.h
@@ -41,20 +41,6 @@ struct xilinx_vdma_config {
int ext_fsync;
};
-/**
- * enum xdma_ip_type: DMA IP type.
- *
- * XDMA_TYPE_AXIDMA: Axi dma ip.
- * XDMA_TYPE_CDMA: Axi cdma ip.
- * XDMA_TYPE_VDMA: Axi vdma ip.
- *
- */
-enum xdma_ip_type {
- XDMA_TYPE_AXIDMA = 0,
- XDMA_TYPE_CDMA,
- XDMA_TYPE_VDMA,
-};
-
int xilinx_vdma_channel_set_config(struct dma_chan *dchan,
struct xilinx_vdma_config *cfg);