aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm/swiotlb.h
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2019-02-21 23:15:10 +1100
committerMichael Ellerman <mpe@ellerman.id.au>2019-02-21 23:15:10 +1100
commitd0055df0c9c1471c389197a69f43e300185a75aa (patch)
tree7a1c253162f9ea99bf544fac4ae9219c398cae3f /arch/powerpc/include/asm/swiotlb.h
parentMerge branch 'fixes' into next (diff)
parentpowerpc/dma: trim the fat from <asm/dma-mapping.h> (diff)
downloadlinux-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 'arch/powerpc/include/asm/swiotlb.h')
-rw-r--r--arch/powerpc/include/asm/swiotlb.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/powerpc/include/asm/swiotlb.h b/arch/powerpc/include/asm/swiotlb.h
index f65ecf57b66c..b7d082c0ec25 100644
--- a/arch/powerpc/include/asm/swiotlb.h
+++ b/arch/powerpc/include/asm/swiotlb.h
@@ -13,12 +13,7 @@
#include <linux/swiotlb.h>
-extern const struct dma_map_ops powerpc_swiotlb_dma_ops;
-
extern unsigned int ppc_swiotlb_enable;
-int __init swiotlb_setup_bus_notifier(void);
-
-extern void pci_dma_dev_setup_swiotlb(struct pci_dev *pdev);
#ifdef CONFIG_SWIOTLB
void swiotlb_detect_4g(void);