Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / at91-sama5d4_xplained.dts

diff --git a/arch/arm/boot/dts/at91-sama5d4_xplained.dts b/arch/arm/boot/dts/at91-sama5d4_xplained.dts
index 924d9491780da2be265983ca9db597378a353aaa..e5974a17374cfeb32d68c64b093c07c67eb581f0 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d4_xplained.dts
+++ b/arch/arm/boot/dts/at91-sama5d4_xplained.dts
@@ -16,7 +16,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x20000000>;
        };