meta: remove accidental conflict marker

from solving conflict with upstream in commit: b8f8bf5 original commit: starfive-tech@01862f8 Signed-off-by: MichaIng <[email protected]>
MichaIng · Jul 5, 2024 · 6874a3b · 6874a3b
1 parent 6fd71c8
commit 6874a3b
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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)