diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-10-22 20:03:34 +0300 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-10-22 20:03:34 +0300 |
| commit | 3985b18650bf2365debb142624f877007b31ada2 (patch) | |
| tree | ac8910bfd2e800ac840c93ae84013e5b1f2cd19d /include/linux/dma-attrs.h | |
| parent | 5b6d12b532bb2e4f114d8a2904eaac1ece43ea20 (diff) | |
| parent | 0faf49393534fa4263bfbda7d0566e2e3d1aaf37 (diff) | |
Automatically merging tracking-integration-linux-qcomlt into merge-linux-linarotracking-ll-linux-linaro-extra-20151104.0ll-20151022.1linux-linaro-4.3-rc6-2015.10ll_20151022.1
Conflicting files:
Diffstat (limited to 'include/linux/dma-attrs.h')
| -rw-r--r-- | include/linux/dma-attrs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/dma-attrs.h b/include/linux/dma-attrs.h index c8e1831d7572..eb1b9d727f39 100644 --- a/include/linux/dma-attrs.h +++ b/include/linux/dma-attrs.h @@ -18,6 +18,8 @@ enum dma_attr { DMA_ATTR_NO_KERNEL_MAPPING, DMA_ATTR_SKIP_CPU_SYNC, DMA_ATTR_FORCE_CONTIGUOUS, + DMA_ATTR_STRONGLY_ORDERED, + DMA_ATTR_SKIP_ZEROING, DMA_ATTR_MAX, }; |