aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2013-09-04 09:06:53 -0400
committerVinod Koul <vinod.koul@intel.com>2013-09-04 09:06:53 -0400
commitbd127639f43ed00f721b403c7c252caa19d0f613 (patch)
treefbecc9ae6b7a0b41c061aafff06f1fabd7c1e73b /include/linux
parent265d9c673d47fcd5812d69dc07104b706285de56 (diff)
parentdbaf6d85114bd2043f3ca758f71f9f7e4e579601 (diff)
Merge branch 'topic/api_caps' into for-linus
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/dmaengine.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index 13ac4f553227..2601186ab183 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -380,11 +380,6 @@ struct dma_slave_config {
380 * should be checked by controller as well 380 * should be checked by controller as well
381 * @cmd_pause: true, if pause and thereby resume is supported 381 * @cmd_pause: true, if pause and thereby resume is supported
382 * @cmd_terminate: true, if terminate cmd is supported 382 * @cmd_terminate: true, if terminate cmd is supported
383 *
384 * @max_sg_nr: maximum number of SG segments supported
385 * 0 for no maximum
386 * @max_sg_len: maximum length of a SG segment supported
387 * 0 for no maximum
388 */ 383 */
389struct dma_slave_caps { 384struct dma_slave_caps {
390 u32 src_addr_widths; 385 u32 src_addr_widths;
@@ -392,9 +387,6 @@ struct dma_slave_caps {
392 u32 directions; 387 u32 directions;
393 bool cmd_pause; 388 bool cmd_pause;
394 bool cmd_terminate; 389 bool cmd_terminate;
395
396 u32 max_sg_nr;
397 u32 max_sg_len;
398}; 390};
399 391
400static inline const char *dma_chan_name(struct dma_chan *chan) 392static inline const char *dma_chan_name(struct dma_chan *chan)