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

[deliverable/linux.git] / arch / arm / boot / dts / omap2420-n8x0-common.dtsi

diff --git a/arch/arm/boot/dts/omap2420-n8x0-common.dtsi b/arch/arm/boot/dts/omap2420-n8x0-common.dtsi
index db95aadcca70193f0cb95f11753911cefcc37a4d..7e5ffc583c90ab565d05b0d3850ae82bdbe16074 100644 (file)
--- a/arch/arm/boot/dts/omap2420-n8x0-common.dtsi
+++ b/arch/arm/boot/dts/omap2420-n8x0-common.dtsi
@@ -1,7 +1,7 @@
 #include "omap2420.dtsi"
 
 / {
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x8000000>; /* 128 MB */
        };