]> git.karo-electronics.de Git - karo-tx-linux.git/commit
ARM: ux500: fix devicetree builds
authorLinus Walleij <linus.walleij@stericsson.com>
Wed, 7 Aug 2013 13:37:52 +0000 (15:37 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 14 Aug 2013 20:32:07 +0000 (22:32 +0200)
commit2ce05a14bb379bd81ba3ad12cc08b2c4bda83480
treec75f15864724e1296138212b065f060e47d44755
parent2771211ad6d2489d87be2b8920115efe1439b34c
ARM: ux500: fix devicetree builds

The patch set beginning with commit:
"ARM: ux500: Apply a ste-* prefix onto snowball.dts"
thru commit:
"ARM: ux500: Remove u9540.dts as it's been replaced"
altered the names of the ux500 device tree files but forgot
to:

- Rename the ccu8540-pinctrl.dtsi file

- Update #include statements from files using these
  files, so the build broke.

- Update the Makefile for the device trees so the build
  broke.

Fix it up so we can build them all again.

Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi [moved from arch/arm/boot/dts/ccu8540-pinctrl.dtsi with 100% similarity]
arch/arm/boot/dts/ste-ccu8540.dts
arch/arm/boot/dts/ste-ccu9540.dts
arch/arm/boot/dts/ste-href.dtsi
arch/arm/boot/dts/ste-hrefprev60.dts
arch/arm/boot/dts/ste-hrefv60plus.dts
arch/arm/boot/dts/ste-snowball.dts