diff options
Diffstat (limited to 'arch/arm/boot/dts/imx6sx.dtsi')
| -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>; |