Merge branch 'sprd/dt' into next/dt

[linux-2.6-block.git] / arch / arm / boot / dts / tegra20-harmony.dts

diff --git a/arch/arm/boot/dts/tegra20-harmony.dts b/arch/arm/boot/dts/tegra20-harmony.dts
index 628a55a9318befb6e098aaeb3e593185fb544dbc..1d96d92b72a7bf538a54f03a33f064914e418dc1 100644 (file)
--- a/arch/arm/boot/dts/tegra20-harmony.dts
+++ b/arch/arm/boot/dts/tegra20-harmony.dts
@@ -18,7 +18,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@0 {
                reg = <0x00000000 0x40000000>;
        };