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

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

diff --git a/arch/arm/boot/dts/da850-evm.dts b/arch/arm/boot/dts/da850-evm.dts
index 5b2b1ed04d510cf52a952cdfc2c43d580d4f0d83..f2e7609e5346afc6145379b9adcb2d4080f35157 100644 (file)
--- a/arch/arm/boot/dts/da850-evm.dts
+++ b/arch/arm/boot/dts/da850-evm.dts
@@ -281,7 +281,7 @@
        flash: m25p80@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "m25p64";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <30000000>;
                m25p,fast-read;
                reg = <0>;