Merge tag 'asm-generic' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx28-duckbill-2-enocean.dts

diff --git a/arch/arm/boot/dts/imx28-duckbill-2-enocean.dts b/arch/arm/boot/dts/imx28-duckbill-2-enocean.dts
index 4450047885ebb198d77d112cdf41ff31c9cd4374..7f8d40a9c67ebe151bb8c3f3c6a505ff2c4733c0 100644 (file)
--- a/arch/arm/boot/dts/imx28-duckbill-2-enocean.dts
+++ b/arch/arm/boot/dts/imx28-duckbill-2-enocean.dts
@@ -20,7 +20,7 @@
        model = "I2SE Duckbill 2 EnOcean";
        compatible = "i2se,duckbill-2-enocean", "i2se,duckbill-2", "fsl,imx28";
 
-       memory {
+       memory@40000000 {
                reg = <0x40000000 0x08000000>;
        };