Merge tag 'samsung-dt-pinctrl-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / arch / arm / boot / dts / s5pv210-aquila.dts

diff --git a/arch/arm/boot/dts/s5pv210-aquila.dts b/arch/arm/boot/dts/s5pv210-aquila.dts
index f6cb82f36aaead1ba00687adac6a24f7ae15d39d..40139923eef0abef1c4b2ae65b17b5754177a37c 100644 (file)
--- a/arch/arm/boot/dts/s5pv210-aquila.dts
+++ b/arch/arm/boot/dts/s5pv210-aquila.dts
@@ -29,7 +29,7 @@
                bootargs = "console=ttySAC2,115200n8 root=/dev/mmcblk1p5 rw rootwait ignore_loglevel earlyprintk";
        };
 
-       memory {
+       memory@30000000 {
                device_type = "memory";
                reg = <0x30000000 0x05000000
                        0x40000000 0x18000000>;