summaryrefslogtreecommitdiffstats
path: root/arch/x86/pci/sta2x11-fixup.c
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@datenfreihafen.org>2021-02-24 13:36:58 +0100
committerStefan Schmidt <stefan@datenfreihafen.org>2021-02-24 13:36:58 +0100
commitcdd38c5f1ce4398ec58fec95904b75824daab7b5 (patch)
tree639cf51fe8ee120a13e61b13d448aeaf4d044c74 /arch/x86/pci/sta2x11-fixup.c
parent04052a318fb93491f1f3b4d282cb806f588e9326 (diff)
parentfcb3007371e1a4afb03280af1b336a83287fe115 (diff)
downloadlinux-cdd38c5f1ce4398ec58fec95904b75824daab7b5.tar.bz2
Merge remote-tracking branch 'net/master'
Diffstat (limited to 'arch/x86/pci/sta2x11-fixup.c')
-rw-r--r--arch/x86/pci/sta2x11-fixup.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/pci/sta2x11-fixup.c b/arch/x86/pci/sta2x11-fixup.c
index 5701d5ba3df4..7d2525691854 100644
--- a/arch/x86/pci/sta2x11-fixup.c
+++ b/arch/x86/pci/sta2x11-fixup.c
@@ -11,7 +11,8 @@
#include <linux/pci_ids.h>
#include <linux/export.h>
#include <linux/list.h>
-#include <linux/dma-direct.h>
+#include <linux/dma-map-ops.h>
+#include <linux/swiotlb.h>
#include <asm/iommu.h>
#define STA2X11_SWIOTLB_SIZE (4*1024*1024)