Merge tag 'sound-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

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

diff --git a/arch/arm/boot/dts/bcm953012er.dts b/arch/arm/boot/dts/bcm953012er.dts
index 17f63c7a04374ab1f23909c318cb01f56a16966f..250a1d6f2d05cdd3a12aaf32dcaafc1a594f9132 100644 (file)
--- a/arch/arm/boot/dts/bcm953012er.dts
+++ b/arch/arm/boot/dts/bcm953012er.dts
@@ -40,6 +40,7 @@
        compatible = "brcm,bcm953012er", "brcm,brcm53012", "brcm,bcm4708";
 
        memory {
+               device_type = "memory";
                reg = <0x00000000 0x8000000>;
        };