diff options
author | 2019-02-21 23:15:10 +1100 | |
---|---|---|
committer | 2019-02-21 23:15:10 +1100 | |
commit | d0055df0c9c1471c389197a69f43e300185a75aa (patch) | |
tree | 7a1c253162f9ea99bf544fac4ae9219c398cae3f /include | |
parent | Merge branch 'fixes' into next (diff) | |
parent | powerpc/dma: trim the fat from <asm/dma-mapping.h> (diff) | |
download | linux-dev-d0055df0c9c1471c389197a69f43e300185a75aa.tar.xz linux-dev-d0055df0c9c1471c389197a69f43e300185a75aa.zip |
Merge branch 'topic/dma' into next
Merge hch's big DMA rework series. This is in a topic branch in case he
wants to merge it to minimise conflicts.
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/swiotlb.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h index 7c007ed7505f..54254388899e 100644 --- a/include/linux/swiotlb.h +++ b/include/linux/swiotlb.h @@ -60,9 +60,6 @@ extern void swiotlb_tbl_sync_single(struct device *hwdev, size_t size, enum dma_data_direction dir, enum dma_sync_target target); -extern int -swiotlb_dma_supported(struct device *hwdev, u64 mask); - #ifdef CONFIG_SWIOTLB extern enum swiotlb_force swiotlb_force; extern phys_addr_t io_tlb_start, io_tlb_end; |