Merge branch 'topic/raid' into for-linus

mariux64 · Apr 10, 2018 · 477e0f9 · 477e0f9
2 parents 185a6cd + 0c0eb4c
commit 477e0f9
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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;