diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2013-08-06 11:01:19 -0400 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2013-08-16 09:02:08 -0400 |
| commit | 97fdd4e18c8eaaa330b3b5399b1ad6795b467df5 (patch) | |
| tree | f1c15667f33a93b117408d994033a009bdf6bfb7 | |
| parent | ca60985c0042ec391fa7e6131b2894ed5638feab (diff) | |
ARM: kirkwood: use dts pre-processor for nsa310 boards
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-nsa310-common.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-nsa310.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-nsa310a.dts | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/kirkwood-nsa310-common.dtsi b/arch/arm/boot/dts/kirkwood-nsa310-common.dtsi index 8f739c8eb83a..06267a91de38 100644 --- a/arch/arm/boot/dts/kirkwood-nsa310-common.dtsi +++ b/arch/arm/boot/dts/kirkwood-nsa310-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 | model = "ZyXEL NSA310"; | 5 | model = "ZyXEL NSA310"; |
diff --git a/arch/arm/boot/dts/kirkwood-nsa310.dts b/arch/arm/boot/dts/kirkwood-nsa310.dts index 62fb0a9acf34..ebc3ed9f6c8b 100644 --- a/arch/arm/boot/dts/kirkwood-nsa310.dts +++ b/arch/arm/boot/dts/kirkwood-nsa310.dts | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /dts-v1/; | 1 | /dts-v1/; |
| 2 | 2 | ||
| 3 | /include/ "kirkwood-nsa310-common.dtsi" | 3 | #include "kirkwood-nsa310-common.dtsi" |
| 4 | 4 | ||
| 5 | / { | 5 | / { |
| 6 | compatible = "zyxel,nsa310", "marvell,kirkwood-88f6281", "marvell,kirkwood"; | 6 | compatible = "zyxel,nsa310", "marvell,kirkwood-88f6281", "marvell,kirkwood"; |
diff --git a/arch/arm/boot/dts/kirkwood-nsa310a.dts b/arch/arm/boot/dts/kirkwood-nsa310a.dts index 1070e9d81c5f..ab0212b0e6f5 100644 --- a/arch/arm/boot/dts/kirkwood-nsa310a.dts +++ b/arch/arm/boot/dts/kirkwood-nsa310a.dts | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /dts-v1/; | 1 | /dts-v1/; |
| 2 | 2 | ||
| 3 | /include/ "kirkwood-nsa310-common.dtsi" | 3 | #include "kirkwood-nsa310-common.dtsi" |
| 4 | 4 | ||
| 5 | /* | 5 | /* |
| 6 | * There are at least two different NSA310 designs. This variant does | 6 | * There are at least two different NSA310 designs. This variant does |