From 5f05949260223a033e842f56871fb65814ef1d59 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 29 Feb 2024 18:56:14 +0100 Subject: ARM: dts: imx6sx: fix, remove conflict marker Fixes: 5955a854cd80 ("Merge commit v5.4.132 into fslc-5.15-2.2.x-imx") Signed-off-by: Max Krummenacher --- arch/arm/boot/dts/imx6sx.dtsi | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi index 15174c7ccbab..9fdec78ecf8b 100644 --- a/arch/arm/boot/dts/imx6sx.dtsi +++ b/arch/arm/boot/dts/imx6sx.dtsi @@ -940,7 +940,6 @@ reg = <0x020e4000 0x4000>; }; -<<<<<<< HEAD ldb: ldb@20e0014 { #address-cells = <1>; #size-cells = <0>; -- cgit v1.2.3