ARM: kirkwood: rename kirwood-nsa310-common to 3x0-common
authorAdam Baker <adam@baker-net.org.uk>
Tue, 8 Apr 2014 22:34:32 +0000 (23:34 +0100)
committerJason Cooper <jason@lakedaemon.net>
Thu, 24 Apr 2014 04:41:59 +0000 (04:41 +0000)
 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>
arch/arm/boot/dts/kirkwood-nsa310.dts
arch/arm/boot/dts/kirkwood-nsa310a.dts
arch/arm/boot/dts/kirkwood-nsa320.dts
arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi [moved from arch/arm/boot/dts/kirkwood-nsa310-common.dtsi with 100% similarity]

Simple merge
Simple merge