Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / rk3288-popmetal.dts

diff --git a/arch/arm/boot/dts/rk3288-popmetal.dts b/arch/arm/boot/dts/rk3288-popmetal.dts
index d582811fbd7b0e6995f1eba10c0a2e8a202ae8e9..f82b956ebf17f83e7747a6c4a419f19800e37be1 100644 (file)
--- a/arch/arm/boot/dts/rk3288-popmetal.dts
+++ b/arch/arm/boot/dts/rk3288-popmetal.dts
@@ -49,6 +49,7 @@
        compatible = "chipspark,popmetal-rk3288", "rockchip,rk3288";
 
        memory{
+               device_type = "memory";
                reg = <0 0x80000000>;
        };