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

[deliverable/linux.git] / arch / arm / boot / dts / omap4-duovero.dtsi

diff --git a/arch/arm/boot/dts/omap4-duovero.dtsi b/arch/arm/boot/dts/omap4-duovero.dtsi
index a90b582e4c3f15d3307b184989c48b4dc51fd011..ec0bd9779e1a582eb8a17497b36b55e95f1fb074 100644 (file)
--- a/arch/arm/boot/dts/omap4-duovero.dtsi
+++ b/arch/arm/boot/dts/omap4-duovero.dtsi
@@ -12,7 +12,7 @@
        model = "Gumstix Duovero";
        compatible = "gumstix,omap4-duovero", "ti,omap4430", "ti,omap4";
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x40000000>; /* 1 GB */
        };