| Message ID | 20201124103546.839711-1-maxime@cerno.tech (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | cd817f001fb5e79438ab35df70f89691a2e5e01d |
| Headers | show |
| Series | soc: sunxi: Fix compilation of sunxi_mbus | expand |
From: Arnd Bergmann <arnd@arndb.de> On Tue, 24 Nov 2020 11:35:46 +0100, Maxime Ripard 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. Applied to arm/drivers, thanks for the update! [1/1] soc: sunxi: Fix compilation of sunxi_mbus commit: e24f7fac3b973ad24b0fd96f6de47695c90f6528 Arnd
Hello: This patch was applied to soc/soc.git (refs/heads/for-next): 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") > Signed-off-by: Maxime Ripard <maxime@cerno.tech> > > [...] 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
diff --git a/drivers/soc/sunxi/sunxi_mbus.c b/drivers/soc/sunxi/sunxi_mbus.c index a9d077f73c3a..e9925c8487d7 100644 --- a/drivers/soc/sunxi/sunxi_mbus.c +++ b/drivers/soc/sunxi/sunxi_mbus.c @@ -2,7 +2,7 @@ /* Copyright (C) 2020 Maxime Ripard <maxime@cerno.tech> */ #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>
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") Signed-off-by: Maxime Ripard <maxime@cerno.tech> --- drivers/soc/sunxi/sunxi_mbus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)