summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2013-08-06 15:01:19 +0000
committerJason Cooper <jason@lakedaemon.net>2013-08-16 13:02:08 +0000
commit97fdd4e18c8eaaa330b3b5399b1ad6795b467df5 (patch)
treef1c15667f33a93b117408d994033a009bdf6bfb7
parentca60985c0042ec391fa7e6131b2894ed5638feab (diff)
ARM: kirkwood: use dts pre-processor for nsa310 boards
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
-rw-r--r--arch/arm/boot/dts/kirkwood-nsa310-common.dtsi4
-rw-r--r--arch/arm/boot/dts/kirkwood-nsa310.dts2
-rw-r--r--arch/arm/boot/dts/kirkwood-nsa310a.dts2
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/kirkwood-nsa310-common.dtsi b/arch/arm/boot/dts/kirkwood-nsa310-common.dtsi
index 8f739c8eb83..06267a91de3 100644
--- a/arch/arm/boot/dts/kirkwood-nsa310-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-nsa310-common.dtsi
@@ -1,5 +1,5 @@
-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6281.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
/ {
model = "ZyXEL NSA310";
diff --git a/arch/arm/boot/dts/kirkwood-nsa310.dts b/arch/arm/boot/dts/kirkwood-nsa310.dts
index 62fb0a9acf3..ebc3ed9f6c8 100644
--- a/arch/arm/boot/dts/kirkwood-nsa310.dts
+++ b/arch/arm/boot/dts/kirkwood-nsa310.dts
@@ -1,6 +1,6 @@
/dts-v1/;
-/include/ "kirkwood-nsa310-common.dtsi"
+#include "kirkwood-nsa310-common.dtsi"
/ {
compatible = "zyxel,nsa310", "marvell,kirkwood-88f6281", "marvell,kirkwood";
diff --git a/arch/arm/boot/dts/kirkwood-nsa310a.dts b/arch/arm/boot/dts/kirkwood-nsa310a.dts
index 1070e9d81c5..ab0212b0e6f 100644
--- a/arch/arm/boot/dts/kirkwood-nsa310a.dts
+++ b/arch/arm/boot/dts/kirkwood-nsa310a.dts
@@ -1,6 +1,6 @@
/dts-v1/;
-/include/ "kirkwood-nsa310-common.dtsi"
+#include "kirkwood-nsa310-common.dtsi"
/*
* There are at least two different NSA310 designs. This variant does