summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2018-04-10 06:25:42 +0300
committerVinod Koul <vinod.koul@intel.com>2018-04-10 06:25:42 +0300
commit477e0f90aea39d9945c7e8f9a7b33a0861015161 (patch)
tree54c64a4cf04887a51407ee515ed91a1d0a712a08
parent185a6cdb78ddf2dc60e2c700c68f8a53c91ede99 (diff)
parent0c0eb4caf03bb6d3d92c70560e0530c8fdf62284 (diff)
downloadlinux-477e0f90aea39d9945c7e8f9a7b33a0861015161.tar.xz
Merge branch 'topic/raid' into for-linus
-rw-r--r--include/linux/dmaengine.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index f838764993eb..861be5cab1df 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -470,7 +470,11 @@ typedef void (*dma_async_tx_callback_result)(void *dma_async_param,
const struct dmaengine_result *result);
struct dmaengine_unmap_data {
+#if IS_ENABLED(CONFIG_DMA_ENGINE_RAID)
+ u16 map_cnt;
+#else
u8 map_cnt;
+#endif
u8 to_cnt;
u8 from_cnt;
u8 bidi_cnt;