Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx6sl-warp.dts

diff --git a/arch/arm/boot/dts/imx6sl-warp.dts b/arch/arm/boot/dts/imx6sl-warp.dts
index 404e602e67813f05c043f6414601937c23a4573b..408da704c459b5d4d7d5e9ef90fdadda17b63162 100644 (file)
--- a/arch/arm/boot/dts/imx6sl-warp.dts
+++ b/arch/arm/boot/dts/imx6sl-warp.dts
@@ -55,6 +55,7 @@
        compatible = "warp,imx6sl-warp", "fsl,imx6sl";
 
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x20000000>;
        };