Merge tag 'ceph-for-4.9-rc1' of git://github.com/ceph/ceph-client

[cascardo/linux.git] / arch / arm / boot / dts / s5pv210-smdkv210.dts

diff --git a/arch/arm/boot/dts/s5pv210-smdkv210.dts b/arch/arm/boot/dts/s5pv210-smdkv210.dts
index 54fcc3f..7539831 100644 (file)
--- a/arch/arm/boot/dts/s5pv210-smdkv210.dts
+++ b/arch/arm/boot/dts/s5pv210-smdkv210.dts
@@ -29,7 +29,7 @@
                bootargs = "console=ttySAC0,115200n8 root=/dev/mmcblk0p1 rw rootwait ignore_loglevel earlyprintk";
        };
 
-       memory {
+       memory@20000000 {
                device_type = "memory";
                reg = <0x20000000 0x40000000>;
        };
@@ -197,7 +197,7 @@
        display-timings {
                native-mode = <&timing0>;
 
-               timing0: timing@0 {
+               timing0: timing {
                        /* 800x480@60Hz */
                        clock-frequency = <24373920>;
                        hactive = <800>;