diff options
author | Ezequiel Garcia <ezequiel.garcia@free-electrons.com> | 2013-07-26 09:18:02 -0400 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2013-08-06 10:11:37 -0400 |
commit | 0ab6129c56fb87d824b09549b91f9108dfba9f9b (patch) | |
tree | 625045abad24bad388dda82ab53afb0584aee973 | |
parent | 0789d0b2c342bc0fdfe813994668b80fcef5d05a (diff) |
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>
34 files changed, 58 insertions, 58 deletions
diff --git a/arch/arm/boot/dts/kirkwood-cloudbox.dts b/arch/arm/boot/dts/kirkwood-cloudbox.dts index 00c48d26de68..9bf139c5a34d 100644 --- a/arch/arm/boot/dts/kirkwood-cloudbox.dts +++ b/arch/arm/boot/dts/kirkwood-cloudbox.dts | |||
@@ -1,7 +1,7 @@ | |||
1 | /dts-v1/; | 1 | /dts-v1/; |
2 | 2 | ||
3 | /include/ "kirkwood.dtsi" | 3 | #include "kirkwood.dtsi" |
4 | /include/ "kirkwood-6281.dtsi" | 4 | #include "kirkwood-6281.dtsi" |
5 | 5 | ||
6 | / { | 6 | / { |
7 | model = "LaCie CloudBox"; | 7 | model = "LaCie CloudBox"; |
diff --git a/arch/arm/boot/dts/kirkwood-db-88f6281.dts b/arch/arm/boot/dts/kirkwood-db-88f6281.dts index 9d777edd1f36..f420cbe856f7 100644 --- a/arch/arm/boot/dts/kirkwood-db-88f6281.dts +++ b/arch/arm/boot/dts/kirkwood-db-88f6281.dts | |||
@@ -11,8 +11,8 @@ | |||
11 | 11 | ||
12 | /dts-v1/; | 12 | /dts-v1/; |
13 | 13 | ||
14 | /include/ "kirkwood-db.dtsi" | 14 | #include "kirkwood-db.dtsi" |
15 | /include/ "kirkwood-6281.dtsi" | 15 | #include "kirkwood-6281.dtsi" |
16 | 16 | ||
17 | / { | 17 | / { |
18 | model = "Marvell DB-88F6281-BP Development Board"; | 18 | model = "Marvell DB-88F6281-BP Development Board"; |
diff --git a/arch/arm/boot/dts/kirkwood-db-88f6282.dts b/arch/arm/boot/dts/kirkwood-db-88f6282.dts index f4c852886d23..c5df86607412 100644 --- a/arch/arm/boot/dts/kirkwood-db-88f6282.dts +++ b/arch/arm/boot/dts/kirkwood-db-88f6282.dts | |||
@@ -11,8 +11,8 @@ | |||
11 | 11 | ||
12 | /dts-v1/; | 12 | /dts-v1/; |
13 | 13 | ||
14 | /include/ "kirkwood-db.dtsi" | 14 | #include "kirkwood-db.dtsi" |
15 | /include/ "kirkwood-6282.dtsi" | 15 | #include "kirkwood-6282.dtsi" |
16 | 16 | ||
17 | / { | 17 | / { |
18 | model = "Marvell DB-88F6282-BP Development Board"; | 18 | model = "Marvell DB-88F6282-BP Development Board"; |
diff --git a/arch/arm/boot/dts/kirkwood-db.dtsi b/arch/arm/boot/dts/kirkwood-db.dtsi index c87cfb816120..29bd98efc824 100644 --- a/arch/arm/boot/dts/kirkwood-db.dtsi +++ b/arch/arm/boot/dts/kirkwood-db.dtsi | |||
@@ -12,7 +12,7 @@ | |||
12 | * and 6282 variants of the Marvell Kirkwood Development Board. | 12 | * and 6282 variants of the Marvell Kirkwood Development Board. |
13 | */ | 13 | */ |
14 | 14 | ||
15 | /include/ "kirkwood.dtsi" | 15 | #include "kirkwood.dtsi" |
16 | 16 | ||
17 | / { | 17 | / { |
18 | memory { | 18 | memory { |
diff --git a/arch/arm/boot/dts/kirkwood-dns320.dts b/arch/arm/boot/dts/kirkwood-dns320.dts index 14d4ceea3057..e112ca62d978 100644 --- a/arch/arm/boot/dts/kirkwood-dns320.dts +++ b/arch/arm/boot/dts/kirkwood-dns320.dts | |||
@@ -1,6 +1,6 @@ | |||
1 | /dts-v1/; | 1 | /dts-v1/; |
2 | 2 | ||
3 | /include/ "kirkwood-dnskw.dtsi" | 3 | #include "kirkwood-dnskw.dtsi" |
4 | 4 | ||
5 | / { | 5 | / { |
6 | model = "D-Link DNS-320 NAS (Rev A1)"; | 6 | model = "D-Link DNS-320 NAS (Rev A1)"; |
diff --git a/arch/arm/boot/dts/kirkwood-dns325.dts b/arch/arm/boot/dts/kirkwood-dns325.dts index 63872570e6ce..5119fb8a8eb6 100644 --- a/arch/arm/boot/dts/kirkwood-dns325.dts +++ b/arch/arm/boot/dts/kirkwood-dns325.dts | |||
@@ -1,6 +1,6 @@ | |||
1 | /dts-v1/; | 1 | /dts-v1/; |
2 | 2 | ||
3 | /include/ "kirkwood-dnskw.dtsi" | 3 | #include "kirkwood-dnskw.dtsi" |
4 | 4 | ||
5 | / { | 5 | / { |
6 | model = "D-Link DNS-325 NAS (Rev A1)"; | 6 | model = "D-Link DNS-325 NAS (Rev A1)"; |
diff --git a/arch/arm/boot/dts/kirkwood-dnskw.dtsi b/arch/arm/boot/dts/kirkwood-dnskw.dtsi index 0afe1d07c803..2e04284846a0 100644 --- a/arch/arm/boot/dts/kirkwood-dnskw.dtsi +++ b/arch/arm/boot/dts/kirkwood-dnskw.dtsi | |||
@@ -1,5 +1,5 @@ | |||
1 | /include/ "kirkwood.dtsi" | 1 | #include "kirkwood.dtsi" |
2 | /include/ "kirkwood-6281.dtsi" | 2 | #include "kirkwood-6281.dtsi" |
3 | 3 | ||
4 | / { | 4 | / { |
5 | model = "D-Link DNS NASes (kirkwood-based)"; | 5 | model = "D-Link DNS NASes (kirkwood-based)"; |
diff --git a/arch/arm/boot/dts/kirkwood-dockstar.dts b/arch/arm/boot/dts/kirkwood-dockstar.dts index 7714742bb8d8..4387ae8e93fe 100644 --- a/arch/arm/boot/dts/kirkwood-dockstar.dts +++ b/arch/arm/boot/dts/kirkwood-dockstar.dts | |||
@@ -1,7 +1,7 @@ | |||
1 | /dts-v1/; | 1 | /dts-v1/; |
2 | 2 | ||
3 | /include/ "kirkwood.dtsi" | 3 | #include "kirkwood.dtsi" |
4 | /include/ "kirkwood-6281.dtsi" | 4 | #include "kirkwood-6281.dtsi" |
5 | 5 | ||
6 | / { | 6 | / { |
7 | model = "Seagate FreeAgent Dockstar"; | 7 | model = "Seagate FreeAgent Dockstar"; |
diff --git a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwood-dreamplug.dts index 36c7ba38d500..c62837837246 100644 --- a/arch/arm/boot/dts/kirkwood-dreamplug.dts +++ b/arch/arm/boot/dts/kirkwood-dreamplug.dts | |||
@@ -1,7 +1,7 @@ | |||
1 | /dts-v1/; | 1 | /dts-v1/; |
2 | 2 | ||
3 | /include/ "kirkwood.dtsi" | 3 | #include "kirkwood.dtsi" |
4 | /include/ "kirkwood-6281.dtsi" | 4 | #include "kirkwood-6281.dtsi" |
5 | 5 | ||
6 | / { | 6 | / { |
7 | model = "Globalscale Technologies Dreamplug"; | 7 | model = "Globalscale Technologies Dreamplug"; |
diff --git a/arch/arm/boot/dts/kirkwood-goflexnet.dts b/arch/arm/boot/dts/kirkwood-goflexnet.dts index 31caa6405065..e57118039277 100644 --- a/arch/arm/boot/dts/kirkwood-goflexnet.dts +++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts | |||
@@ -1,7 +1,7 @@ | |||
1 | /dts-v1/; | 1 | /dts-v1/; |
2 | 2 | ||
3 | /include/ "kirkwood.dtsi" | 3 | #include "kirkwood.dtsi" |
4 | /include/ "kirkwood-6281.dtsi" | 4 | #include "kirkwood-6281.dtsi" |
5 | 5 | ||
6 | / { | 6 | / { |
7 | model = "Seagate GoFlex Net"; | 7 | model = "Seagate GoFlex Net"; |
diff --git a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts index 1e642f39b154..2c5673adb4bd 100644 --- a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts +++ b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts | |||
@@ -1,7 +1,7 @@ | |||
1 | /dts-v1/; | 1 | /dts-v1/; |
2 | 2 | ||
3 | /include/ "kirkwood.dtsi" | 3 | #include "kirkwood.dtsi" |
4 | /include/ "kirkwood-6281.dtsi" | 4 | #include "kirkwood-6281.dtsi" |
5 | 5 | ||
6 | / { | 6 | / { |
7 | model = "Globalscale Technologies Guruplug Server Plus"; | 7 | model = "Globalscale Technologies Guruplug Server Plus"; |
diff --git a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-ib62x0.dts index 20c4b081f420..158161ff6826 100644 --- a/arch/arm/boot/dts/kirkwood-ib62x0.dts +++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts | |||
@@ -1,7 +1,7 @@ | |||
1 | /dts-v1/; | 1 | /dts-v1/; |
2 | 2 | ||
3 | /include/ "kirkwood.dtsi" | 3 | #include "kirkwood.dtsi" |
4 | /include/ "kirkwood-6281.dtsi" | 4 | #include "kirkwood-6281.dtsi" |
5 | 5 | ||
6 | / { | 6 | / { |
7 | model = "RaidSonic ICY BOX IB-NAS62x0 (Rev B)"; | 7 | model = "RaidSonic ICY BOX IB-NAS62x0 (Rev B)"; |
diff --git a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts index 441204e8abc6..1a984876b428 100644 --- a/arch/arm/boot/dts/kirkwood-iconnect.dts +++ b/arch/arm/boot/dts/kirkwood-iconnect.dts | |||
@@ -1,7 +1,7 @@ | |||
1 | /dts-v1/; | 1 | /dts-v1/; |
2 | 2 | ||
3 | /include/ "kirkwood.dtsi" | 3 | #include "kirkwood.dtsi" |
4 | /include/ "kirkwood-6281.dtsi" | 4 | #include "kirkwood-6281.dtsi" |
5 | 5 | ||
6 | / { | 6 | / { |
7 | model = "Iomega Iconnect"; | 7 | model = "Iomega Iconnect"; |
diff --git a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts index 00a7bfe5e83b..fd7f053e9c96 100644 --- a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts +++ b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | |||
@@ -1,7 +1,7 @@ | |||
1 | /dts-v1/; | 1 | /dts-v1/; |
2 | 2 | ||
3 | /include/ "kirkwood.dtsi" | 3 | #include "kirkwood.dtsi" |
4 | /include/ "kirkwood-6281.dtsi" | 4 | #include "kirkwood-6281.dtsi" |
5 | 5 | ||
6 | / { | 6 | / { |
7 | model = "Iomega StorCenter ix2-200"; | 7 | model = "Iomega StorCenter ix2-200"; |
diff --git a/arch/arm/boot/dts/kirkwood-is2.dts b/arch/arm/boot/dts/kirkwood-is2.dts index c3f036b86cca..bd88a236f729 100644 --- a/arch/arm/boot/dts/kirkwood-is2.dts +++ b/arch/arm/boot/dts/kirkwood-is2.dts | |||
@@ -1,6 +1,6 @@ | |||
1 | /dts-v1/; | 1 | /dts-v1/; |
2 | 2 | ||
3 | /include/ "kirkwood-ns2-common.dtsi" | 3 | #include "kirkwood-ns2-common.dtsi" |
4 | 4 | ||
5 | / { | 5 | / { |
6 | model = "LaCie Internet Space v2"; | 6 | model = "LaCie Internet Space v2"; |
diff --git a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts index 5d9f5ea78700..b071d37cc291 100644 --- a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts +++ b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts | |||
@@ -1,7 +1,7 @@ | |||
1 | /dts-v1/; | 1 | /dts-v1/; |
2 | 2 | ||
3 | /include/ "kirkwood.dtsi" | 3 | #include "kirkwood.dtsi" |
4 | /include/ "kirkwood-98dx4122.dtsi" | 4 | #include "kirkwood-98dx4122.dtsi" |
5 | 5 | ||
6 | / { | 6 | / { |
7 | model = "Keymile Kirkwood Reference Design"; | 7 | model = "Keymile Kirkwood Reference Design"; |
diff --git a/arch/arm/boot/dts/kirkwood-lschlv2.dts b/arch/arm/boot/dts/kirkwood-lschlv2.dts index 9f55d95f35f5..e2fa368aef25 100644 --- a/arch/arm/boot/dts/kirkwood-lschlv2.dts +++ b/arch/arm/boot/dts/kirkwood-lschlv2.dts | |||
@@ -1,6 +1,6 @@ | |||
1 | /dts-v1/; | 1 | /dts-v1/; |
2 | 2 | ||
3 | /include/ "kirkwood-lsxl.dtsi" | 3 | #include "kirkwood-lsxl.dtsi" |
4 | 4 | ||
5 | / { | 5 | / { |
6 | model = "Buffalo Linkstation LS-CHLv2"; | 6 | model = "Buffalo Linkstation LS-CHLv2"; |
diff --git a/arch/arm/boot/dts/kirkwood-lsxhl.dts b/arch/arm/boot/dts/kirkwood-lsxhl.dts index 5c84c118ed8d..8d89cdf8d6bf 100644 --- a/arch/arm/boot/dts/kirkwood-lsxhl.dts +++ b/arch/arm/boot/dts/kirkwood-lsxhl.dts | |||
@@ -1,6 +1,6 @@ | |||
1 | /dts-v1/; | 1 | /dts-v1/; |
2 | 2 | ||
3 | /include/ "kirkwood-lsxl.dtsi" | 3 | #include "kirkwood-lsxl.dtsi" |
4 | 4 | ||
5 | / { | 5 | / { |
6 | model = "Buffalo Linkstation LS-XHL"; | 6 | model = "Buffalo Linkstation LS-XHL"; |
diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-lsxl.dtsi index 31b17f5b9d28..f7e247cc925a 100644 --- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi +++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi | |||
@@ -1,5 +1,5 @@ | |||
1 | /include/ "kirkwood.dtsi" | 1 | #include "kirkwood.dtsi" |
2 | /include/ "kirkwood-6281.dtsi" | 2 | #include "kirkwood-6281.dtsi" |
3 | 3 | ||
4 | / { | 4 | / { |
5 | chosen { | 5 | chosen { |
diff --git a/arch/arm/boot/dts/kirkwood-mplcec4.dts b/arch/arm/boot/dts/kirkwood-mplcec4.dts index 6179333fd71f..382ad99ab2c6 100644 --- a/arch/arm/boot/dts/kirkwood-mplcec4.dts +++ b/arch/arm/boot/dts/kirkwood-mplcec4.dts | |||
@@ -1,7 +1,7 @@ | |||
1 | /dts-v1/; | 1 | /dts-v1/; |
2 | 2 | ||
3 | /include/ "kirkwood.dtsi" | 3 | #include "kirkwood.dtsi" |
4 | /include/ "kirkwood-6281.dtsi" | 4 | #include "kirkwood-6281.dtsi" |
5 | 5 | ||
6 | / { | 6 | / { |
7 | model = "MPL CEC4"; | 7 | model = "MPL CEC4"; |
diff --git a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts index ad6ade7d9191..8be68bda8182 100644 --- 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 @@ | |||
1 | /dts-v1/; | 1 | /dts-v1/; |
2 | 2 | ||
3 | /include/ "kirkwood.dtsi" | 3 | #include "kirkwood.dtsi" |
4 | /include/ "kirkwood-6282.dtsi" | 4 | #include "kirkwood-6282.dtsi" |
5 | 5 | ||
6 | / { | 6 | / { |
7 | model = "NETGEAR ReadyNAS Duo v2"; | 7 | model = "NETGEAR ReadyNAS Duo v2"; |
diff --git a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi index 2afac0405816..d0fb34dc1667 100644 --- a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi +++ b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi | |||
@@ -1,5 +1,5 @@ | |||
1 | /include/ "kirkwood.dtsi" | 1 | #include "kirkwood.dtsi" |
2 | /include/ "kirkwood-6281.dtsi" | 2 | #include "kirkwood-6281.dtsi" |
3 | 3 | ||
4 | / { | 4 | / { |
5 | chosen { | 5 | chosen { |
diff --git a/arch/arm/boot/dts/kirkwood-ns2.dts b/arch/arm/boot/dts/kirkwood-ns2.dts index b50e93d7796c..0599f3cb844e 100644 --- a/arch/arm/boot/dts/kirkwood-ns2.dts +++ b/arch/arm/boot/dts/kirkwood-ns2.dts | |||
@@ -1,6 +1,6 @@ | |||
1 | /dts-v1/; | 1 | /dts-v1/; |
2 | 2 | ||
3 | /include/ "kirkwood-ns2-common.dtsi" | 3 | #include "kirkwood-ns2-common.dtsi" |
4 | 4 | ||
5 | / { | 5 | / { |
6 | model = "LaCie Network Space v2"; | 6 | model = "LaCie Network Space v2"; |
diff --git a/arch/arm/boot/dts/kirkwood-ns2lite.dts b/arch/arm/boot/dts/kirkwood-ns2lite.dts index af8259fe8955..b0e17984aea0 100644 --- a/arch/arm/boot/dts/kirkwood-ns2lite.dts +++ b/arch/arm/boot/dts/kirkwood-ns2lite.dts | |||
@@ -1,6 +1,6 @@ | |||
1 | /dts-v1/; | 1 | /dts-v1/; |
2 | 2 | ||
3 | /include/ "kirkwood-ns2-common.dtsi" | 3 | #include "kirkwood-ns2-common.dtsi" |
4 | 4 | ||
5 | / { | 5 | / { |
6 | model = "LaCie Network Space Lite v2"; | 6 | model = "LaCie Network Space Lite v2"; |
diff --git a/arch/arm/boot/dts/kirkwood-ns2max.dts b/arch/arm/boot/dts/kirkwood-ns2max.dts index 85f24d227e17..d4f6a586d553 100644 --- a/arch/arm/boot/dts/kirkwood-ns2max.dts +++ b/arch/arm/boot/dts/kirkwood-ns2max.dts | |||
@@ -1,6 +1,6 @@ | |||
1 | /dts-v1/; | 1 | /dts-v1/; |
2 | 2 | ||
3 | /include/ "kirkwood-ns2-common.dtsi" | 3 | #include "kirkwood-ns2-common.dtsi" |
4 | 4 | ||
5 | / { | 5 | / { |
6 | model = "LaCie Network Space Max v2"; | 6 | model = "LaCie Network Space Max v2"; |
diff --git a/arch/arm/boot/dts/kirkwood-ns2mini.dts b/arch/arm/boot/dts/kirkwood-ns2mini.dts index 329e530bffe7..f30e05af6473 100644 --- a/arch/arm/boot/dts/kirkwood-ns2mini.dts +++ b/arch/arm/boot/dts/kirkwood-ns2mini.dts | |||
@@ -1,6 +1,6 @@ | |||
1 | /dts-v1/; | 1 | /dts-v1/; |
2 | 2 | ||
3 | /include/ "kirkwood-ns2-common.dtsi" | 3 | #include "kirkwood-ns2-common.dtsi" |
4 | 4 | ||
5 | / { | 5 | / { |
6 | /* This machine is embedded in the first LaCie CloudBox product. */ | 6 | /* This machine is embedded in the first LaCie CloudBox product. */ |
diff --git a/arch/arm/boot/dts/kirkwood-nsa310.dts b/arch/arm/boot/dts/kirkwood-nsa310.dts index 69003598f5fa..8fd683c34142 100644 --- a/arch/arm/boot/dts/kirkwood-nsa310.dts +++ b/arch/arm/boot/dts/kirkwood-nsa310.dts | |||
@@ -1,7 +1,7 @@ | |||
1 | /dts-v1/; | 1 | /dts-v1/; |
2 | 2 | ||
3 | /include/ "kirkwood.dtsi" | 3 | #include "kirkwood.dtsi" |
4 | /include/ "kirkwood-6281.dtsi" | 4 | #include "kirkwood-6281.dtsi" |
5 | 5 | ||
6 | / { | 6 | / { |
7 | model = "ZyXEL NSA310"; | 7 | model = "ZyXEL NSA310"; |
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts index 38dc8517d777..365b792b23a7 100644 --- a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts +++ b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts | |||
@@ -1,7 +1,7 @@ | |||
1 | /dts-v1/; | 1 | /dts-v1/; |
2 | 2 | ||
3 | /include/ "kirkwood.dtsi" | 3 | #include "kirkwood.dtsi" |
4 | /include/ "kirkwood-6282.dtsi" | 4 | #include "kirkwood-6282.dtsi" |
5 | 5 | ||
6 | / { | 6 | / { |
7 | model = "Plat'Home OpenBlocksA6"; | 7 | model = "Plat'Home OpenBlocksA6"; |
diff --git a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi index f7143f128504..0cc5f26bbbb6 100644 --- a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi +++ b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi | |||
@@ -6,8 +6,8 @@ | |||
6 | * Licensed under GPLv2 | 6 | * Licensed under GPLv2 |
7 | */ | 7 | */ |
8 | 8 | ||
9 | /include/ "kirkwood.dtsi" | 9 | #include "kirkwood.dtsi" |
10 | /include/ "kirkwood-6281.dtsi" | 10 | #include "kirkwood-6281.dtsi" |
11 | 11 | ||
12 | / { | 12 | / { |
13 | memory { | 13 | memory { |
diff --git a/arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts b/arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts index f620ce48de97..eac6a21f3b1f 100644 --- a/arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts +++ b/arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts | |||
@@ -8,7 +8,7 @@ | |||
8 | 8 | ||
9 | /dts-v1/; | 9 | /dts-v1/; |
10 | 10 | ||
11 | /include/ "kirkwood-sheevaplug-common.dtsi" | 11 | #include "kirkwood-sheevaplug-common.dtsi" |
12 | 12 | ||
13 | / { | 13 | / { |
14 | model = "Globalscale Technologies eSATA SheevaPlug"; | 14 | model = "Globalscale Technologies eSATA SheevaPlug"; |
diff --git a/arch/arm/boot/dts/kirkwood-sheevaplug.dts b/arch/arm/boot/dts/kirkwood-sheevaplug.dts index bf1dff251432..bb61918313db 100644 --- a/arch/arm/boot/dts/kirkwood-sheevaplug.dts +++ b/arch/arm/boot/dts/kirkwood-sheevaplug.dts | |||
@@ -8,7 +8,7 @@ | |||
8 | 8 | ||
9 | /dts-v1/; | 9 | /dts-v1/; |
10 | 10 | ||
11 | /include/ "kirkwood-sheevaplug-common.dtsi" | 11 | #include "kirkwood-sheevaplug-common.dtsi" |
12 | 12 | ||
13 | / { | 13 | / { |
14 | model = "Globalscale Technologies SheevaPlug"; | 14 | model = "Globalscale Technologies SheevaPlug"; |
diff --git a/arch/arm/boot/dts/kirkwood-topkick.dts b/arch/arm/boot/dts/kirkwood-topkick.dts index f2052d7bc10f..974f1e0f09b2 100644 --- a/arch/arm/boot/dts/kirkwood-topkick.dts +++ b/arch/arm/boot/dts/kirkwood-topkick.dts | |||
@@ -1,7 +1,7 @@ | |||
1 | /dts-v1/; | 1 | /dts-v1/; |
2 | 2 | ||
3 | /include/ "kirkwood.dtsi" | 3 | #include "kirkwood.dtsi" |
4 | /include/ "kirkwood-6282.dtsi" | 4 | #include "kirkwood-6282.dtsi" |
5 | 5 | ||
6 | / { | 6 | / { |
7 | model = "Univeral Scientific Industrial Co. Topkick-1281P2"; | 7 | model = "Univeral Scientific Industrial Co. Topkick-1281P2"; |
diff --git a/arch/arm/boot/dts/kirkwood-ts219-6281.dts b/arch/arm/boot/dts/kirkwood-ts219-6281.dts index 6dd1038e4de4..3867ae3030be 100644 --- a/arch/arm/boot/dts/kirkwood-ts219-6281.dts +++ b/arch/arm/boot/dts/kirkwood-ts219-6281.dts | |||
@@ -1,8 +1,8 @@ | |||
1 | /dts-v1/; | 1 | /dts-v1/; |
2 | 2 | ||
3 | /include/ "kirkwood.dtsi" | 3 | #include "kirkwood.dtsi" |
4 | /include/ "kirkwood-6281.dtsi" | 4 | #include "kirkwood-6281.dtsi" |
5 | /include/ "kirkwood-ts219.dtsi" | 5 | #include "kirkwood-ts219.dtsi" |
6 | 6 | ||
7 | / { | 7 | / { |
8 | ocp@f1000000 { | 8 | ocp@f1000000 { |
diff --git a/arch/arm/boot/dts/kirkwood-ts219-6282.dts b/arch/arm/boot/dts/kirkwood-ts219-6282.dts index 6fdc5ffcaae5..7d6cc867678e 100644 --- a/arch/arm/boot/dts/kirkwood-ts219-6282.dts +++ b/arch/arm/boot/dts/kirkwood-ts219-6282.dts | |||
@@ -1,8 +1,8 @@ | |||
1 | /dts-v1/; | 1 | /dts-v1/; |
2 | 2 | ||
3 | /include/ "kirkwood.dtsi" | 3 | #include "kirkwood.dtsi" |
4 | /include/ "kirkwood-6282.dtsi" | 4 | #include "kirkwood-6282.dtsi" |
5 | /include/ "kirkwood-ts219.dtsi" | 5 | #include "kirkwood-ts219.dtsi" |
6 | 6 | ||
7 | / { | 7 | / { |
8 | ocp@f1000000 { | 8 | ocp@f1000000 { |