Browse Source

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>
Ezequiel Garcia 12 years ago
parent
commit
0ab6129c56
34 changed files with 58 additions and 58 deletions
  1. 2 2
      arch/arm/boot/dts/kirkwood-cloudbox.dts
  2. 2 2
      arch/arm/boot/dts/kirkwood-db-88f6281.dts
  3. 2 2
      arch/arm/boot/dts/kirkwood-db-88f6282.dts
  4. 1 1
      arch/arm/boot/dts/kirkwood-db.dtsi
  5. 1 1
      arch/arm/boot/dts/kirkwood-dns320.dts
  6. 1 1
      arch/arm/boot/dts/kirkwood-dns325.dts
  7. 2 2
      arch/arm/boot/dts/kirkwood-dnskw.dtsi
  8. 2 2
      arch/arm/boot/dts/kirkwood-dockstar.dts
  9. 2 2
      arch/arm/boot/dts/kirkwood-dreamplug.dts
  10. 2 2
      arch/arm/boot/dts/kirkwood-goflexnet.dts
  11. 2 2
      arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
  12. 2 2
      arch/arm/boot/dts/kirkwood-ib62x0.dts
  13. 2 2
      arch/arm/boot/dts/kirkwood-iconnect.dts
  14. 2 2
      arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
  15. 1 1
      arch/arm/boot/dts/kirkwood-is2.dts
  16. 2 2
      arch/arm/boot/dts/kirkwood-km_kirkwood.dts
  17. 1 1
      arch/arm/boot/dts/kirkwood-lschlv2.dts
  18. 1 1
      arch/arm/boot/dts/kirkwood-lsxhl.dts
  19. 2 2
      arch/arm/boot/dts/kirkwood-lsxl.dtsi
  20. 2 2
      arch/arm/boot/dts/kirkwood-mplcec4.dts
  21. 2 2
      arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
  22. 2 2
      arch/arm/boot/dts/kirkwood-ns2-common.dtsi
  23. 1 1
      arch/arm/boot/dts/kirkwood-ns2.dts
  24. 1 1
      arch/arm/boot/dts/kirkwood-ns2lite.dts
  25. 1 1
      arch/arm/boot/dts/kirkwood-ns2max.dts
  26. 1 1
      arch/arm/boot/dts/kirkwood-ns2mini.dts
  27. 2 2
      arch/arm/boot/dts/kirkwood-nsa310.dts
  28. 2 2
      arch/arm/boot/dts/kirkwood-openblocks_a6.dts
  29. 2 2
      arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
  30. 1 1
      arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts
  31. 1 1
      arch/arm/boot/dts/kirkwood-sheevaplug.dts
  32. 2 2
      arch/arm/boot/dts/kirkwood-topkick.dts
  33. 3 3
      arch/arm/boot/dts/kirkwood-ts219-6281.dts
  34. 3 3
      arch/arm/boot/dts/kirkwood-ts219-6282.dts

+ 2 - 2
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";

+ 2 - 2
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";

+ 2 - 2
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";

+ 1 - 1
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 {

+ 1 - 1
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)";

+ 1 - 1
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)";

+ 2 - 2
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)";

+ 2 - 2
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";

+ 2 - 2
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";

+ 2 - 2
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";

+ 2 - 2
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";

+ 2 - 2
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)";

+ 2 - 2
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";

+ 2 - 2
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";

+ 1 - 1
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";

+ 2 - 2
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";

+ 1 - 1
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";

+ 1 - 1
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";

+ 2 - 2
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 {

+ 2 - 2
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";

+ 2 - 2
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";

+ 2 - 2
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 {

+ 1 - 1
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";

+ 1 - 1
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";

+ 1 - 1
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";

+ 1 - 1
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. */

+ 2 - 2
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";

+ 2 - 2
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";

+ 2 - 2
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 {

+ 1 - 1
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";

+ 1 - 1
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";

+ 2 - 2
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";

+ 3 - 3
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 {

+ 3 - 3
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 {