Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx6ul-tx6ul.dtsi

diff --git a/arch/arm/boot/dts/imx6ul-tx6ul.dtsi b/arch/arm/boot/dts/imx6ul-tx6ul.dtsi
index 65111f9843f4eaf715f0446e6ba8f70389c38cc1..f678d18ad44ab2c31fd5da091e0a1c80ac08c565 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-tx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul-tx6ul.dtsi
@@ -70,8 +70,8 @@
                stdout-path = &uart1;
        };
 
-       memory {
-               reg = <0 0>; /* will be filled by U-Boot */
+       memory@80000000 {
+               reg = <0x80000000 0>; /* will be filled by U-Boot */
        };
 
        clocks {