Merge tag 'upstream-4.19-rc1' of git://git.infradead.org/linux-ubifs

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / tegra20-tamonten.dtsi

diff --git a/arch/arm/boot/dts/tegra20-tamonten.dtsi b/arch/arm/boot/dts/tegra20-tamonten.dtsi
index 872046d48709a3e5f8abb701432f1891c72ad85c..20137fc578b1b48a7d3c4cfa323f26dbeb322ac8 100644 (file)
--- a/arch/arm/boot/dts/tegra20-tamonten.dtsi
+++ b/arch/arm/boot/dts/tegra20-tamonten.dtsi
@@ -15,7 +15,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@0 {
                reg = <0x00000000 0x20000000>;
        };