Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...

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

diff --git a/arch/arm/boot/dts/imx31.dtsi b/arch/arm/boot/dts/imx31.dtsi
index d7f6fb764997aff54cc833d77eb28111e820bd7e..6b62f0745b829b502eaabcf3d7ba9feb5e113e5d 100644 (file)
--- a/arch/arm/boot/dts/imx31.dtsi
+++ b/arch/arm/boot/dts/imx31.dtsi
@@ -55,7 +55,7 @@
                interrupt-parent = <&avic>;
                ranges;
 
-               iram: iram@1fffc000 {
+               iram: sram@1fffc000 {
                        compatible = "mmio-sram";
                        reg = <0x1fffc000 0x4000>;
                        #address-cells = <1>;