diff options
| author | Tom Rini <trini@konsulko.com> | 2015-04-03 09:14:38 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-04-03 09:14:38 -0400 |
| commit | 692e5c4e7eb267f3d8f3a8c9d2348eff6f5f21e2 (patch) | |
| tree | e47f18f7dd1507e91a46fcd6f550914ad3774f5a /arch/arm/dts/Makefile | |
| parent | 8a5c9ca4d0b8aa13a1bb321494d24f656a9a7d72 (diff) | |
| parent | 76a30fedd44428c7108084266389c9b4ba5678c8 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-tegra
Conflicts:
board/armltd/vexpress64/vexpress64.c
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm/dts/Makefile')
| -rw-r--r-- | arch/arm/dts/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index cbe5b86755..f897e6d969 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -24,7 +24,7 @@ dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \ tegra20-trimslice.dtb \ tegra20-ventana.dtb \ tegra20-whistler.dtb \ - tegra20-colibri_t20_iris.dtb \ + tegra20-colibri.dtb \ tegra30-apalis.dtb \ tegra30-beaver.dtb \ tegra30-cardhu.dtb \ |