diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-08-16 23:29:02 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-08-16 23:29:02 +0200 |
| commit | a74c7494c0c9b6eeb2ece99831945b2b8da41f56 (patch) | |
| tree | 2f1def126e8cfa0a29c3501ce1e5531d51d1905f /arch/arm/boot/dts/Makefile | |
| parent | 146d8cd929d49809e395370567ea533fa15a70d1 (diff) | |
| parent | 69f9cdc63319e5ccc210b30d1cec1dfda7096b04 (diff) | |
| download | talos-obmc-linux-a74c7494c0c9b6eeb2ece99831945b2b8da41f56.tar.gz talos-obmc-linux-a74c7494c0c9b6eeb2ece99831945b2b8da41f56.zip | |
Merge tag 'uniphier-dt-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into next/dt
Pull "UniPhier ARM SoC DT updates for v4.14" from Masahiro Yamada:
- complete migrating to SPDX License Identifier
- remove support for old SoC
- add nodes for NAND, Audio pinctrl
- replace /include/ with #include
* tag 'uniphier-dt-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
ARM: dts: uniphier: add Denali NAND controller node
ARM: dts: uniphier use #include instead of /include/
ARM: dts: uniphier: remove sLD3 SoC support
ARM: dts: uniphier: add audio out pin-mux node
ARM: dts: uniphier: use SPDX-License-Identifier (2nd)
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index b6bb9c369a2a..03995aa0559f 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -974,7 +974,6 @@ dtb-$(CONFIG_ARCH_UNIPHIER) += \ uniphier-pro4-sanji.dtb \ uniphier-pxs2-gentil.dtb \ uniphier-pxs2-vodka.dtb \ - uniphier-sld3-ref.dtb \ uniphier-sld8-ref.dtb dtb-$(CONFIG_ARCH_VERSATILE) += \ versatile-ab.dtb \ |
