summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2013-09-04 18:36:53 +0530
committerVinod Koul <vinod.koul@intel.com>2013-09-04 18:36:53 +0530
commitbd127639f43ed00f721b403c7c252caa19d0f613 (patch)
treefbecc9ae6b7a0b41c061aafff06f1fabd7c1e73b /include
parent265d9c673d47fcd5812d69dc07104b706285de56 (diff)
parentdbaf6d85114bd2043f3ca758f71f9f7e4e579601 (diff)
downloadlinux-stable-bd127639f43ed00f721b403c7c252caa19d0f613.tar.gz
linux-stable-bd127639f43ed00f721b403c7c252caa19d0f613.tar.bz2
linux-stable-bd127639f43ed00f721b403c7c252caa19d0f613.zip
Merge branch 'topic/api_caps' into for-linus
Diffstat (limited to 'include')
-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 {
* should be checked by controller as well
* @cmd_pause: true, if pause and thereby resume is supported
* @cmd_terminate: true, if terminate cmd is supported
- *
- * @max_sg_nr: maximum number of SG segments supported
- * 0 for no maximum
- * @max_sg_len: maximum length of a SG segment supported
- * 0 for no maximum
*/
struct dma_slave_caps {
u32 src_addr_widths;
@@ -392,9 +387,6 @@ struct dma_slave_caps {
u32 directions;
bool cmd_pause;
bool cmd_terminate;
-
- u32 max_sg_nr;
- u32 max_sg_len;
};
static inline const char *dma_chan_name(struct dma_chan *chan)