ARM: kirkwood: Use the preprocessor on device tree files

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Tested-by: Andrew Lunn <andrew@lunn.ch> Tested-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2024-11-20 18:54:09 +08:00 · 2013-07-26 10:18:02 -03:00 · 2013-07-26 10:18:02 -03:00 · 0ab6129c56
commit 0ab6129c56
parent 0789d0b2c3
34 changed files with 58 additions and 58 deletions
--- a/arch/arm/boot/dts/kirkwood-cloudbox.dts
+++ b/arch/arm/boot/dts/kirkwood-cloudbox.dts
@ -1,7 +1,7 @@
 /dts-v1/;

-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6281.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"

 / {
 	model = "LaCie CloudBox";
--- a/arch/arm/boot/dts/kirkwood-db-88f6281.dts
+++ b/arch/arm/boot/dts/kirkwood-db-88f6281.dts
@ -11,8 +11,8 @@

 /dts-v1/;

-/include/ "kirkwood-db.dtsi"
-/include/ "kirkwood-6281.dtsi"
+#include "kirkwood-db.dtsi"
+#include "kirkwood-6281.dtsi"

 / {
 	model = "Marvell DB-88F6281-BP Development Board";
--- a/arch/arm/boot/dts/kirkwood-db-88f6282.dts
+++ b/arch/arm/boot/dts/kirkwood-db-88f6282.dts
@ -11,8 +11,8 @@

 /dts-v1/;

-/include/ "kirkwood-db.dtsi"
-/include/ "kirkwood-6282.dtsi"
+#include "kirkwood-db.dtsi"
+#include "kirkwood-6282.dtsi"

 / {
 	model = "Marvell DB-88F6282-BP Development Board";
--- a/arch/arm/boot/dts/kirkwood-db.dtsi
+++ b/arch/arm/boot/dts/kirkwood-db.dtsi
@ -12,7 +12,7 @@
 * and 6282 variants of the Marvell Kirkwood Development Board.
 */

-/include/ "kirkwood.dtsi"
+#include "kirkwood.dtsi"

 / {
 	memory {
--- a/arch/arm/boot/dts/kirkwood-dns320.dts
+++ b/arch/arm/boot/dts/kirkwood-dns320.dts
@ -1,6 +1,6 @@
 /dts-v1/;

-/include/ "kirkwood-dnskw.dtsi"
+#include "kirkwood-dnskw.dtsi"

 / {
 	model = "D-Link DNS-320 NAS (Rev A1)";
--- a/arch/arm/boot/dts/kirkwood-dns325.dts
+++ b/arch/arm/boot/dts/kirkwood-dns325.dts
@ -1,6 +1,6 @@
 /dts-v1/;

-/include/ "kirkwood-dnskw.dtsi"
+#include "kirkwood-dnskw.dtsi"

 / {
 	model = "D-Link DNS-325 NAS (Rev A1)";
--- a/arch/arm/boot/dts/kirkwood-dnskw.dtsi
+++ b/arch/arm/boot/dts/kirkwood-dnskw.dtsi
@ -1,5 +1,5 @@
-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6281.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"

 / {
 	model = "D-Link DNS NASes (kirkwood-based)";
--- a/arch/arm/boot/dts/kirkwood-dockstar.dts
+++ b/arch/arm/boot/dts/kirkwood-dockstar.dts
@ -1,7 +1,7 @@
 /dts-v1/;

-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6281.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"

 / {
 	model = "Seagate FreeAgent Dockstar";
--- a/arch/arm/boot/dts/kirkwood-dreamplug.dts
+++ b/arch/arm/boot/dts/kirkwood-dreamplug.dts
@ -1,7 +1,7 @@
 /dts-v1/;

-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6281.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"

 / {
 	model = "Globalscale Technologies Dreamplug";
--- a/arch/arm/boot/dts/kirkwood-goflexnet.dts
+++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts
@ -1,7 +1,7 @@
 /dts-v1/;

-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6281.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"

 / {
 	model = "Seagate GoFlex Net";
--- a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
+++ b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
@ -1,7 +1,7 @@
 /dts-v1/;

-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6281.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"

 / {
 	model = "Globalscale Technologies Guruplug Server Plus";
--- a/arch/arm/boot/dts/kirkwood-ib62x0.dts
+++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts
@ -1,7 +1,7 @@
 /dts-v1/;

-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6281.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"

 / {
 	model = "RaidSonic ICY BOX IB-NAS62x0 (Rev B)";
--- a/arch/arm/boot/dts/kirkwood-iconnect.dts
+++ b/arch/arm/boot/dts/kirkwood-iconnect.dts
@ -1,7 +1,7 @@
 /dts-v1/;

-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6281.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"

 / {
 	model = "Iomega Iconnect";
--- a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
+++ b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
@ -1,7 +1,7 @@
 /dts-v1/;

-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6281.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"

 / {
 	model = "Iomega StorCenter ix2-200";
--- a/arch/arm/boot/dts/kirkwood-is2.dts
+++ b/arch/arm/boot/dts/kirkwood-is2.dts
@ -1,6 +1,6 @@
 /dts-v1/;

-/include/ "kirkwood-ns2-common.dtsi"
+#include "kirkwood-ns2-common.dtsi"

 / {
 	model = "LaCie Internet Space v2";
--- a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
+++ b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
@ -1,7 +1,7 @@
 /dts-v1/;

-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-98dx4122.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-98dx4122.dtsi"

 / {
 	model = "Keymile Kirkwood Reference Design";
--- a/arch/arm/boot/dts/kirkwood-lschlv2.dts
+++ b/arch/arm/boot/dts/kirkwood-lschlv2.dts
@ -1,6 +1,6 @@
 /dts-v1/;

-/include/ "kirkwood-lsxl.dtsi"
+#include "kirkwood-lsxl.dtsi"

 / {
 	model = "Buffalo Linkstation LS-CHLv2";
--- a/arch/arm/boot/dts/kirkwood-lsxhl.dts
+++ b/arch/arm/boot/dts/kirkwood-lsxhl.dts
@ -1,6 +1,6 @@
 /dts-v1/;

-/include/ "kirkwood-lsxl.dtsi"
+#include "kirkwood-lsxl.dtsi"

 / {
 	model = "Buffalo Linkstation LS-XHL";
--- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi
+++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
@ -1,5 +1,5 @@
-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6281.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"

 / {
 	chosen {
--- a/arch/arm/boot/dts/kirkwood-mplcec4.dts
+++ b/arch/arm/boot/dts/kirkwood-mplcec4.dts
@ -1,7 +1,7 @@
 /dts-v1/;

-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6281.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"

 / {
 	model = "MPL CEC4";
--- a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
+++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
@ -1,7 +1,7 @@
 /dts-v1/;

-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6282.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6282.dtsi"

 / {
 	model = "NETGEAR ReadyNAS Duo v2";
--- a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
@ -1,5 +1,5 @@
-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6281.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"

 / {
 	chosen {
--- a/arch/arm/boot/dts/kirkwood-ns2.dts
+++ b/arch/arm/boot/dts/kirkwood-ns2.dts
@ -1,6 +1,6 @@
 /dts-v1/;

-/include/ "kirkwood-ns2-common.dtsi"
+#include "kirkwood-ns2-common.dtsi"

 / {
 	model = "LaCie Network Space v2";
--- a/arch/arm/boot/dts/kirkwood-ns2lite.dts
+++ b/arch/arm/boot/dts/kirkwood-ns2lite.dts
@ -1,6 +1,6 @@
 /dts-v1/;

-/include/ "kirkwood-ns2-common.dtsi"
+#include "kirkwood-ns2-common.dtsi"

 / {
 	model = "LaCie Network Space Lite v2";
--- a/arch/arm/boot/dts/kirkwood-ns2max.dts
+++ b/arch/arm/boot/dts/kirkwood-ns2max.dts
@ -1,6 +1,6 @@
 /dts-v1/;

-/include/ "kirkwood-ns2-common.dtsi"
+#include "kirkwood-ns2-common.dtsi"

 / {
 	model = "LaCie Network Space Max v2";
--- a/arch/arm/boot/dts/kirkwood-ns2mini.dts
+++ b/arch/arm/boot/dts/kirkwood-ns2mini.dts
@ -1,6 +1,6 @@
 /dts-v1/;

-/include/ "kirkwood-ns2-common.dtsi"
+#include "kirkwood-ns2-common.dtsi"

 / {
 	/* This machine is embedded in the first LaCie CloudBox product. */
--- a/arch/arm/boot/dts/kirkwood-nsa310.dts
+++ b/arch/arm/boot/dts/kirkwood-nsa310.dts
@ -1,7 +1,7 @@
 /dts-v1/;

-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6281.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"

 / {
 	model = "ZyXEL NSA310";
--- a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
@ -1,7 +1,7 @@
 /dts-v1/;

-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6282.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6282.dtsi"

 / {
 	model = "Plat'Home OpenBlocksA6";
--- a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
@ -6,8 +6,8 @@
 * Licensed under GPLv2
 */

-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6281.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"

 / {
 	memory {
--- a/arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts
+++ b/arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts
@ -8,7 +8,7 @@

 /dts-v1/;

-/include/ "kirkwood-sheevaplug-common.dtsi"
+#include "kirkwood-sheevaplug-common.dtsi"

 / {
 	model = "Globalscale Technologies eSATA SheevaPlug";
--- a/arch/arm/boot/dts/kirkwood-sheevaplug.dts
+++ b/arch/arm/boot/dts/kirkwood-sheevaplug.dts
@ -8,7 +8,7 @@

 /dts-v1/;

-/include/ "kirkwood-sheevaplug-common.dtsi"
+#include "kirkwood-sheevaplug-common.dtsi"

 / {
 	model = "Globalscale Technologies SheevaPlug";
--- a/arch/arm/boot/dts/kirkwood-topkick.dts
+++ b/arch/arm/boot/dts/kirkwood-topkick.dts
@ -1,7 +1,7 @@
 /dts-v1/;

-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6282.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6282.dtsi"

 / {
 	model = "Univeral Scientific Industrial Co. Topkick-1281P2";
--- a/arch/arm/boot/dts/kirkwood-ts219-6281.dts
+++ b/arch/arm/boot/dts/kirkwood-ts219-6281.dts
@ -1,8 +1,8 @@
 /dts-v1/;

-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6281.dtsi"
-/include/ "kirkwood-ts219.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+#include "kirkwood-ts219.dtsi"

 / {
 	ocp@f1000000 {
--- a/arch/arm/boot/dts/kirkwood-ts219-6282.dts
+++ b/arch/arm/boot/dts/kirkwood-ts219-6282.dts
@ -1,8 +1,8 @@
 /dts-v1/;

-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6282.dtsi"
-/include/ "kirkwood-ts219.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6282.dtsi"
+#include "kirkwood-ts219.dtsi"

 / {
 	ocp@f1000000 {