Merge remote-tracking branch 'omap_dss2/for-next'

[deliverable/linux.git] / arch / arm / boot / dts / rk3288-rock2-som.dtsi

diff --git a/arch/arm/boot/dts/rk3288-rock2-som.dtsi b/arch/arm/boot/dts/rk3288-rock2-som.dtsi
index bb1f01e037ba7e2a5ae8126ccff5d98b16f4a0a0..b25ba806d5eec46fd3f92438c9030e22053bfcad 100644 (file)
--- a/arch/arm/boot/dts/rk3288-rock2-som.dtsi
+++ b/arch/arm/boot/dts/rk3288-rock2-som.dtsi
@@ -42,7 +42,7 @@
 #include "rk3288.dtsi"
 
 / {
-       memory {
+       memory@0 {
                reg = <0x0 0x80000000>;
                device_type = "memory";
        };