From 6874a3b9e844b692eb559872f458e7a76764d53b Mon Sep 17 00:00:00 2001 From: MichaIng Date: Sat, 6 Jul 2024 01:03:03 +0200 Subject: [PATCH] meta: remove accidental conflict marker from solving conflict with upstream in commit: https://github.com/MichaIng/linux/commit/b8f8bf5 original commit: https://github.com/starfive-tech/linux/commit/01862f8 Signed-off-by: MichaIng --- drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac.h b/drivers/dma/dw-axi-dmac/dw-axi-dmac.h index 37beadc8cac4..3564990970ed 100644 --- a/drivers/dma/dw-axi-dmac/dw-axi-dmac.h +++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac.h @@ -117,7 +117,6 @@ struct axi_dma_chan_config { u8 prior; u8 hs_sel_dst; u8 hs_sel_src; ->>>>>>> 38fb4c350b8a (dmaengine: dw-axi-dmac: Fix the bug that unable to transfer 270KB data) }; static inline struct device *dchan2dev(struct dma_chan *dchan)