Merge remote-tracking branch 'sound-asoc/for-next'

[deliverable/linux.git] / arch / arm / boot / dts / omap3-pandora-common.dtsi

diff --git a/arch/arm/boot/dts/omap3-pandora-common.dtsi b/arch/arm/boot/dts/omap3-pandora-common.dtsi
index af30d4d993077a372b9e05e92e5f903ff586f21a..53e007abdc7159ee69fd35a120ba30edb0704e3c 100644 (file)
--- a/arch/arm/boot/dts/omap3-pandora-common.dtsi
+++ b/arch/arm/boot/dts/omap3-pandora-common.dtsi
@@ -18,7 +18,7 @@
                };
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x20000000>; /* 512 MB */
        };