Merge branch 'master' into fixes

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx6qdl-icore-rqs.dtsi

diff --git a/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi b/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi
index ba93026ecee8810a551c073709aa96b8e1c20ca5..1d1b4bd0670ffd094d2939ed9c91095d8ae8ba39 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi
@@ -10,6 +10,7 @@
 
 / {
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x80000000>;
        };