From d3087c03f0de99bb0fa5fb7de970ace8aabfd31d Mon Sep 17 00:00:00 2001 From: James Hogan Date: Fri, 31 May 2013 16:12:54 +0100 Subject: [PATCH] metag: *.dts: include using preprocessor Include *.dtsi files from *.dts using the preprocessor to set a good example for future device tree files. Files included in the old way don't get pre-processed. Signed-off-by: James Hogan Acked-by: Grant Likely Cc: devicetree-discuss@lists.ozlabs.org --- arch/metag/boot/dts/skeleton.dts | 2 +- arch/metag/boot/dts/tz1090.dtsi | 2 +- arch/metag/boot/dts/tz1090_generic.dts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/metag/boot/dts/skeleton.dts b/arch/metag/boot/dts/skeleton.dts index 7244d1f..7a49aeb 100644 --- a/arch/metag/boot/dts/skeleton.dts +++ b/arch/metag/boot/dts/skeleton.dts @@ -7,4 +7,4 @@ */ /dts-v1/; -/include/ "skeleton.dtsi" +#include "skeleton.dtsi" diff --git a/arch/metag/boot/dts/tz1090.dtsi b/arch/metag/boot/dts/tz1090.dtsi index ca057f0..ff7bb74 100644 --- a/arch/metag/boot/dts/tz1090.dtsi +++ b/arch/metag/boot/dts/tz1090.dtsi @@ -6,7 +6,7 @@ * published by the Free Software Foundation. */ -/include/ "skeleton.dtsi" +#include "skeleton.dtsi" / { compatible = "toumaz,tz1090", "img,meta"; diff --git a/arch/metag/boot/dts/tz1090_generic.dts b/arch/metag/boot/dts/tz1090_generic.dts index aa826cb..f960909 100644 --- a/arch/metag/boot/dts/tz1090_generic.dts +++ b/arch/metag/boot/dts/tz1090_generic.dts @@ -7,4 +7,4 @@ */ /dts-v1/; -/include/ "tz1090.dtsi" +#include "tz1090.dtsi" -- 2.7.4