Merge branch 'master' into fixes

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

diff --git a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
index a1a6fb5541e17545d8c5c05c8deb6afcc13ecfc9..81b2fcf6eedfb23c79499ca78160d5092625e989 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
@@ -60,6 +60,7 @@
        };
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x40000000>;
        };