Skip to contentSkip to conversation

soc: sunxi: Fix compilation of sunxi_mbus

PATCH Applied Maxime Ripard 3 participants 3 messages Nov 24, 2020 Arm/Allwinner sunXi SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 soc: sunxi: Fix compilation of sunxi_mbus

dma_direct_set_offset has been moved from dma-mapping.h to dma-map-ops.h, but our driver hasn't been updated resulting in a build breakage. Let's change the header to fix the build.

Fixes 16fee29b0735 ("dma-mapping: remove the dma_direct_set_offset export")
---
 drivers/soc/sunxi/sunxi_mbus.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/sunxi/sunxi_mbus.c +1 -1
index a9d077f73c3a..e9925c8487d7 100644
@@ -2,7 +2,7 @@
 /* Copyright (C) 2020 Maxime Ripard <[email protected]> */
 
 #include <linux/device.h>
-#include <linux/dma-mapping.h>
+#include <linux/dma-map-ops.h>
 #include <linux/init.h>
 #include <linux/notifier.h>
 #include <linux/of.h>
Signature · 1 line
2.28.0
#1 lore raw

From: Arnd Bergmann <[email protected]>

Quoted 3 lines · Maxime Ripard

dma_direct_set_offset has been moved from dma-mapping.h to dma-map-ops.h, but our driver hasn't been updated resulting in a build breakage. Let's change the header to fix the build.

Applied to arm/drivers, thanks for the update!

[1/1] soc: sunxi: Fix compilation of sunxi_mbus

      commit: e24f7fac3b973ad24b0fd96f6de47695c90f6528

       Arnd
#2 lore raw
In reply to Maxime Ripard
This patch was applied to soc/soc.git (refs/heads/for-next):

Hello:

This patch was applied to soc/soc.git (refs/heads/for-next):

Quoted 8 lines · On Tue, 24 Nov 2020 11:35:46 +0100 you wrote:

dma_direct_set_offset has been moved from dma-mapping.h to dma-map-ops.h, but our driver hasn't been updated resulting in a build breakage. Let's change the header to fix the build.

Fixes 16fee29b0735 ("dma-mapping: remove the dma_direct_set_offset export")

[...]

Here is the summary with links:
- soc: sunxi: Fix compilation of sunxi_mbus

    https://git.kernel.org/soc/soc/c/cd817f001fb5

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html