diff options
| author | Tom Rini <trini@ti.com> | 2013-12-10 17:15:18 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-12-10 17:15:18 -0500 |
| commit | 4b210ad34282bfd9fc982a8e3c9a9126f4094cdb (patch) | |
| tree | f91ebdc46ede952728602d5ecc18e64ad0e52682 /board/compulab/cm_t35/Makefile | |
| parent | 65b7fe28a12bbaccc7a0c076f5f9f213150030e7 (diff) | |
| parent | f15ea6e1d67782a1626d4a4922b6c20e380085e5 (diff) | |
| download | u-boot-imx-4b210ad34282bfd9fc982a8e3c9a9126f4094cdb.zip u-boot-imx-4b210ad34282bfd9fc982a8e3c9a9126f4094cdb.tar.gz u-boot-imx-4b210ad34282bfd9fc982a8e3c9a9126f4094cdb.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
board/samsung/trats2/trats2.c
include/configs/exynos5250-dt.h
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'board/compulab/cm_t35/Makefile')
| -rw-r--r-- | board/compulab/cm_t35/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/compulab/cm_t35/Makefile b/board/compulab/cm_t35/Makefile index 6e2e1cb..ede250b 100644 --- a/board/compulab/cm_t35/Makefile +++ b/board/compulab/cm_t35/Makefile @@ -7,4 +7,4 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y += cm_t35.o leds.o +obj-y += cm_t35.o |