Merge branch 'master' into fixes

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx28-cfa10036.dts

diff --git a/arch/arm/boot/dts/imx28-cfa10036.dts b/arch/arm/boot/dts/imx28-cfa10036.dts
index 8337ca21e28174a9a32174374497328b65e7a9db..d3e3622979c5bf9379dd0f3b9cd5ce55048975f9 100644 (file)
--- a/arch/arm/boot/dts/imx28-cfa10036.dts
+++ b/arch/arm/boot/dts/imx28-cfa10036.dts
@@ -17,6 +17,7 @@
        compatible = "crystalfontz,cfa10036", "fsl,imx28";
 
        memory@40000000 {
+               device_type = "memory";
                reg = <0x40000000 0x08000000>;
        };