Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[deliverable/linux.git] / include / linux / dma-attrs.h

diff --git a/include/linux/dma-attrs.h b/include/linux/dma-attrs.h
index f83f793223ff7491f59c44b3c3bd6d7440b51084..c8e1831d757232c7364ebb909cb77a6442bb4a8a 100644 (file)
--- a/include/linux/dma-attrs.h
+++ b/include/linux/dma-attrs.h
@@ -17,6 +17,7 @@ enum dma_attr {
        DMA_ATTR_NON_CONSISTENT,
        DMA_ATTR_NO_KERNEL_MAPPING,
        DMA_ATTR_SKIP_CPU_SYNC,
+       DMA_ATTR_FORCE_CONTIGUOUS,
        DMA_ATTR_MAX,
 };