diff options
| author | Olof Johansson <olof@lixom.net> | 2017-06-18 21:01:58 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-06-18 21:01:58 -0700 |
| commit | 5088774b8fd052fde39ab3321b8cab2f734facd9 (patch) | |
| tree | 19ac9b6e64fb5c829d952779185cd4681e19a307 /arch/arm/boot/dts/Makefile | |
| parent | 0d817768c09baf1a71fd2ff8e146c1f869eef0a7 (diff) | |
| parent | 508d690e94218d306ab2092d6ee95ca75f9fa98b (diff) | |
| download | blackbird-obmc-linux-5088774b8fd052fde39ab3321b8cab2f734facd9.tar.gz blackbird-obmc-linux-5088774b8fd052fde39ab3321b8cab2f734facd9.zip | |
Merge tag 'tegra-for-4.13-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt
ARM: tegra: Device tree changes for v4.13-rc1
This removes support for the Whistler board, which only a handful of
people ever had access to and which doesn't provide any features over
other Tegra20 devices that we support.
Also this cleans up some PCI related device tree content in preparation
for a future DTC release that has additional checks for the PCI bus.
* tag 'tegra-for-4.13-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
ARM: dts: tegra: fix PCI bus dtc warnings
ARM: tegra: remove Whistler support
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 21e85c0f7fed..6a638a79a8b6 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -928,8 +928,7 @@ dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \ tegra20-seaboard.dtb \ tegra20-tec.dtb \ tegra20-trimslice.dtb \ - tegra20-ventana.dtb \ - tegra20-whistler.dtb + tegra20-ventana.dtb dtb-$(CONFIG_ARCH_TEGRA_3x_SOC) += \ tegra30-apalis-eval.dtb \ tegra30-beaver.dtb \ |
