diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2024-02-29 18:56:14 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2024-02-29 19:20:22 +0100 |
| commit | 5f05949260223a033e842f56871fb65814ef1d59 (patch) | |
| tree | 88a000828d00c83849bf8321563883f14415c7c2 | |
| parent | 81b79a06a058f65e64109b42646e528adc44d66e (diff) | |
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 <max.krummenacher@toradex.com>
| -rw-r--r-- | arch/arm/boot/dts/imx6sx.dtsi | 1 |
1 files changed, 0 insertions, 1 deletions
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>; |