diff options
| author | Linus Torvalds | 2018-02-16 12:22:33 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2018-02-16 12:22:33 -0800 |
| commit | 1e3510b2b053b8253a99511efb668fcc7ae8fcd7 (patch) | |
| tree | 196d1d212e16fa2f7ddc9fee6a7ddfb3ed163c7e /include/linux/dma-mapping.h | |
| parent | af27d9403f5b80685b79c88425086edccecaf711 (diff) | |
| parent | 7bcfab202ca71bece02b283cdd104301c07eece4 (diff) | |
Merge tag 'dma-mapping-4.16-2' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping fixes from Christoph Hellwig:
"A few dma-mapping fixes for the fallout from the changes in rc1"
* tag 'dma-mapping-4.16-2' of git://git.infradead.org/users/hch/dma-mapping:
powerpc/macio: set a proper dma_coherent_mask
dma-mapping: fix a comment typo
dma-direct: comment the dma_direct_free calling convention
dma-direct: mark as is_phys
ia64: fix build failure with CONFIG_SWIOTLB
Diffstat (limited to 'include/linux/dma-mapping.h')
| -rw-r--r-- | include/linux/dma-mapping.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index 34fe8463d10e..eb9eab4ecd6d 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -578,7 +578,7 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) /* * This is a hack for the legacy x86 forbid_dac and iommu_sac_force. Please - * don't use this is new code. + * don't use this in new code. */ #ifndef arch_dma_supported #define arch_dma_supported(dev, mask) (1) |