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

[~andy/linux] / arch / arm / boot / dts / armada-xp-mv78230.dtsi

diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
index f093e3974d6a16839a612a3c9fd003619b3b6600..0358a33cba489d40c97fda0a1bd7cb5769ade9b8 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
@@ -13,7 +13,7 @@
  * common to all Armada XP SoCs.
  */
 
-/include/ "armada-xp.dtsi"
+#include "armada-xp.dtsi"
 
 / {
        model = "Marvell Armada XP MV78230 SoC";
@@ -181,7 +181,7 @@
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupts-cells = <2>;
+                               #interrupt-cells = <2>;
                                interrupts = <82>, <83>, <84>, <85>;
                        };
 
@@ -192,7 +192,7 @@
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupts-cells = <2>;
+                               #interrupt-cells = <2>;
                                interrupts = <87>, <88>, <89>;
                        };
                };