summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-04-23 01:26:15 +0400
committerJason Cooper <jason@lakedaemon.net>2014-04-26 18:39:28 +0400
commit48be9707b4d4e85c950fc9c3ae4ed574a453c060 (patch)
tree9136e91d62069b1bad7eb9de059098ecc9817081
parent0fb28811dd6ff30aec3cd386745309aa63d1d106 (diff)
downloadlinux-48be9707b4d4e85c950fc9c3ae4ed574a453c060.tar.xz
ARM: orion5x: switch to preprocessor includes in DT
This commit switches the Orion5x Device Tree files to use C preprocessor based includes, as it will allow us to use definitions from header files in future commits. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Link: https://lkml.kernel.org/r/1398202002-28530-12-git-send-email-thomas.petazzoni@free-electrons.com Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
-rw-r--r--arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts3
-rw-r--r--arch/arm/boot/dts/orion5x.dtsi2
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts b/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts
index 5ed6c1376901..0245bb3a4cb6 100644
--- a/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts
+++ b/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts
@@ -7,7 +7,8 @@
*/
/dts-v1/;
-/include/ "orion5x.dtsi"
+
+#include "orion5x.dtsi"
/ {
model = "LaCie Ethernet Disk mini V2";
diff --git a/arch/arm/boot/dts/orion5x.dtsi b/arch/arm/boot/dts/orion5x.dtsi
index da57fb9f87b9..2364e3dbc33c 100644
--- a/arch/arm/boot/dts/orion5x.dtsi
+++ b/arch/arm/boot/dts/orion5x.dtsi
@@ -6,7 +6,7 @@
* warranty of any kind, whether express or implied.
*/
-/include/ "skeleton.dtsi"
+#include "skeleton.dtsi"
/ {
model = "Marvell Orion5x SoC";