aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-10-24 12:17:05 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-10-24 12:17:05 -0700
commit1b307ac87075c3207c345822ea276fe4f28481d7 (patch)
tree8d3b04cc685b4dd8d34e9decbae0ba1bb5e8647b /arch
parent9bf8d8bcf3cebe44863188f1f2d822214e84f5b1 (diff)
parent6857a5ebaabc5b9d989872700b4b71dd2a6d6453 (diff)
Merge tag 'dma-mapping-5.10-1' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping fixes from Christoph Hellwig: - document the new dma_{alloc,free}_pages() API - two fixups for the dma-mapping.h split * tag 'dma-mapping-5.10-1' of git://git.infradead.org/users/hch/dma-mapping: dma-mapping: document dma_{alloc,free}_pages dma-mapping: move more functions to dma-map-ops.h ARM/sa1111: add a missing include of dma-map-ops.h
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/common/sa1111.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index c98ebae1aeac..f89c1ea327a2 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -22,7 +22,7 @@
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <linux/spinlock.h>
-#include <linux/dma-mapping.h>
+#include <linux/dma-map-ops.h>
#include <linux/clk.h>
#include <linux/io.h>

Privacy Policy