diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2013-08-06 17:01:19 +0200 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2013-08-16 15:02:08 +0200 |
| commit | 97fdd4e18c8eaaa330b3b5399b1ad6795b467df5 (patch) | |
| tree | f1c15667f33a93b117408d994033a009bdf6bfb7 | |
| parent | ARM: mvebu: use correct #interrupt-cells instead of #interrupts-cells (diff) | |
| download | linux-97fdd4e18c8eaaa330b3b5399b1ad6795b467df5.tar.xz linux-97fdd4e18c8eaaa330b3b5399b1ad6795b467df5.zip | |
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 @@ -/include/ "kirkwood.dtsi" -/include/ "kirkwood-6281.dtsi" +#include "kirkwood.dtsi" +#include "kirkwood-6281.dtsi" / { 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 @@ /dts-v1/; -/include/ "kirkwood-nsa310-common.dtsi" +#include "kirkwood-nsa310-common.dtsi" / { 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 @@ /dts-v1/; -/include/ "kirkwood-nsa310-common.dtsi" +#include "kirkwood-nsa310-common.dtsi" /* * There are at least two different NSA310 designs. This variant does |