Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx6q-rex-pro.dts

diff --git a/arch/arm/boot/dts/imx6q-rex-pro.dts b/arch/arm/boot/dts/imx6q-rex-pro.dts
index d6cae73b19272e4ccd171cae4199737ec367b274..aa3004eab06c2a0ee66440c8172175aec467c1cb 100644 (file)
--- a/arch/arm/boot/dts/imx6q-rex-pro.dts
+++ b/arch/arm/boot/dts/imx6q-rex-pro.dts
@@ -17,6 +17,7 @@
        compatible = "rex,imx6q-rex-pro", "fsl,imx6q";
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x80000000>;
        };
 };