diff options
| author | Adam Baker <adam@baker-net.org.uk> | 2014-04-08 23:34:32 +0100 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-04-24 04:41:59 +0000 |
| commit | 76a93dc923e8e3441d03ecb89dfd080f259b9f8f (patch) | |
| tree | af5947bb2cef2594cb79b6ded3c847fa4bb00f5c | |
| parent | be3d7d023b870d050eaec4ebaa3293fef432dc4b (diff) | |
| download | linux-76a93dc923e8e3441d03ecb89dfd080f259b9f8f.tar.gz linux-76a93dc923e8e3441d03ecb89dfd080f259b9f8f.tar.bz2 linux-76a93dc923e8e3441d03ecb89dfd080f259b9f8f.zip | |
ARM: kirkwood: rename kirwood-nsa310-common to 3x0-common
Rename the include file kirkwood-nsa310-common.dtsi as
it is now also used for NSA320. There is also an NSA325
but that appears not to be as similar so is unlikely to
want to share an include file.
Signed-off-by: Adam Baker <linux@baker-net.org.uk>
Link: https://lkml.kernel.org/r/53447978.2020206@baker-net.org.uk
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-nsa310.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-nsa310a.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-nsa320.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi (renamed from arch/arm/boot/dts/kirkwood-nsa310-common.dtsi) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/kirkwood-nsa310.dts b/arch/arm/boot/dts/kirkwood-nsa310.dts index 372f701d5338..989846ac6577 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-nsa3x0-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 ead7a36d1089..d0a602578f5b 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-nsa3x0-common.dtsi" /* * There are at least two different NSA310 designs. This variant does diff --git a/arch/arm/boot/dts/kirkwood-nsa320.dts b/arch/arm/boot/dts/kirkwood-nsa320.dts index 6c8f6923f5d7..fc20baf0eade 100644 --- a/arch/arm/boot/dts/kirkwood-nsa320.dts +++ b/arch/arm/boot/dts/kirkwood-nsa320.dts @@ -11,7 +11,7 @@ /dts-v1/; -#include "kirkwood-nsa310-common.dtsi" +#include "kirkwood-nsa3x0-common.dtsi" / { model = "Zyxel NSA320"; diff --git a/arch/arm/boot/dts/kirkwood-nsa310-common.dtsi b/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi index 843b8b561e5e..843b8b561e5e 100644 --- a/arch/arm/boot/dts/kirkwood-nsa310-common.dtsi +++ b/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi |