Merge branch 'master' into fixes

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx6qp-zii-rdu2.dts

diff --git a/arch/arm/boot/dts/imx6qp-zii-rdu2.dts b/arch/arm/boot/dts/imx6qp-zii-rdu2.dts
index 8c293e9f36a701ab1f23feab9c5078f6a3807057..98bf7a6b2850b189b276e10b9c8c6bc5507cfd83 100644 (file)
--- a/arch/arm/boot/dts/imx6qp-zii-rdu2.dts
+++ b/arch/arm/boot/dts/imx6qp-zii-rdu2.dts
@@ -50,6 +50,7 @@
 
        /* Will be filled by the bootloader */
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0>;
        };
 };